Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions locales/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12072,6 +12072,38 @@ export interface Locale extends ILocale {
* Approvals
*/
"approvals": string;
/**
* Emoji suggestions
*/
"emojiSuggestions": string;
/**
* Suggest an emoji
*/
"suggestEmoji": string;
/**
* Propose a custom emoji for this server. Your image remains in your Drive while moderators review it.
*/
"emojiSuggestionDescription": string;
/**
* There are no pending emoji suggestions.
*/
"emojiSuggestionNoPending": string;
/**
* Proposed by
*/
"emojiSuggestionProposedBy": string;
/**
* Accept :{name}: and add it to this server?
*/
"emojiSuggestionConfirmAccept": ParameterizedString<"name">;
/**
* Reject the suggestion for :{name}:? The image will remain in the proposer's Drive.
*/
"emojiSuggestionConfirmReject": ParameterizedString<"name">;
/**
* Cancel your suggestion for :{name}:? The image will remain in your Drive.
*/
"emojiSuggestionConfirmCancel": ParameterizedString<"name">;
/**
* Open remote profile
*/
Expand Down
34 changes: 34 additions & 0 deletions packages/backend/migration/1786507200000-EmojiSuggestion.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* SPDX-FileCopyrightText: Sharkey contributors
* SPDX-License-Identifier: AGPL-3.0-only
*/

/**
* @typedef {import('typeorm').MigrationInterface} MigrationInterface
* @typedef {import('typeorm').QueryRunner} QueryRunner
*/

/**
* @class
* @implements {MigrationInterface}
*/
export class EmojiSuggestion1786507200000 {
name = 'EmojiSuggestion1786507200000';

/**
* @param {QueryRunner} queryRunner
*/
async up(queryRunner) {
await queryRunner.query(`CREATE TABLE "emoji_suggestion" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "fileId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "category" character varying(128), "aliases" character varying(128) array NOT NULL DEFAULT '{}', "license" character varying(1024), "localOnly" boolean NOT NULL DEFAULT false, "isSensitive" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_emoji_suggestion" PRIMARY KEY ("id"), CONSTRAINT "FK_emoji_suggestion_user" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_emoji_suggestion_file" FOREIGN KEY ("fileId") REFERENCES "drive_file"("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
await queryRunner.query(`CREATE INDEX "IDX_emoji_suggestion_user" ON "emoji_suggestion" ("userId")`);
await queryRunner.query(`CREATE UNIQUE INDEX "IDX_emoji_suggestion_file" ON "emoji_suggestion" ("fileId")`);
await queryRunner.query(`CREATE UNIQUE INDEX "IDX_emoji_suggestion_name" ON "emoji_suggestion" ("name")`);
}

/**
* @param {QueryRunner} queryRunner
*/
async down(queryRunner) {
await queryRunner.query(`DROP TABLE "emoji_suggestion"`);
}
}
12 changes: 12 additions & 0 deletions packages/backend/src/core/CoreModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import { AchievementService } from './AchievementService.js';
import { AvatarDecorationService } from './AvatarDecorationService.js';
import { CaptchaService } from './CaptchaService.js';
import { CustomEmojiService } from './CustomEmojiService.js';
import { EmojiSuggestionService } from './EmojiSuggestionService.js';
import { DeleteAccountService } from './DeleteAccountService.js';
import { DownloadService } from './DownloadService.js';
import { DriveService } from './DriveService.js';
Expand Down Expand Up @@ -115,6 +116,7 @@ import { ClipEntityService } from './entities/ClipEntityService.js';
import { DriveFileEntityService } from './entities/DriveFileEntityService.js';
import { DriveFolderEntityService } from './entities/DriveFolderEntityService.js';
import { EmojiEntityService } from './entities/EmojiEntityService.js';
import { EmojiSuggestionEntityService } from './entities/EmojiSuggestionEntityService.js';
import { FollowingEntityService } from './entities/FollowingEntityService.js';
import { FollowRequestEntityService } from './entities/FollowRequestEntityService.js';
import { GalleryLikeEntityService } from './entities/GalleryLikeEntityService.js';
Expand Down Expand Up @@ -175,6 +177,7 @@ const $AchievementService: Provider = { provide: 'AchievementService', useExisti
const $AvatarDecorationService: Provider = { provide: 'AvatarDecorationService', useExisting: AvatarDecorationService };
const $CaptchaService: Provider = { provide: 'CaptchaService', useExisting: CaptchaService };
const $CustomEmojiService: Provider = { provide: 'CustomEmojiService', useExisting: CustomEmojiService };
const $EmojiSuggestionService: Provider = { provide: 'EmojiSuggestionService', useExisting: EmojiSuggestionService };
const $DeleteAccountService: Provider = { provide: 'DeleteAccountService', useExisting: DeleteAccountService };
const $DownloadService: Provider = { provide: 'DownloadService', useExisting: DownloadService };
const $DriveService: Provider = { provide: 'DriveService', useExisting: DriveService };
Expand Down Expand Up @@ -269,6 +272,7 @@ const $ClipEntityService: Provider = { provide: 'ClipEntityService', useExisting
const $DriveFileEntityService: Provider = { provide: 'DriveFileEntityService', useExisting: DriveFileEntityService };
const $DriveFolderEntityService: Provider = { provide: 'DriveFolderEntityService', useExisting: DriveFolderEntityService };
const $EmojiEntityService: Provider = { provide: 'EmojiEntityService', useExisting: EmojiEntityService };
const $EmojiSuggestionEntityService: Provider = { provide: 'EmojiSuggestionEntityService', useExisting: EmojiSuggestionEntityService };
const $FollowingEntityService: Provider = { provide: 'FollowingEntityService', useExisting: FollowingEntityService };
const $FollowRequestEntityService: Provider = { provide: 'FollowRequestEntityService', useExisting: FollowRequestEntityService };
const $GalleryLikeEntityService: Provider = { provide: 'GalleryLikeEntityService', useExisting: GalleryLikeEntityService };
Expand Down Expand Up @@ -339,6 +343,7 @@ const $Imports = [
AvatarDecorationService,
CaptchaService,
CustomEmojiService,
EmojiSuggestionService,
DeleteAccountService,
DownloadService,
DriveService,
Expand Down Expand Up @@ -430,6 +435,7 @@ const $Imports = [
DriveFileEntityService,
DriveFolderEntityService,
EmojiEntityService,
EmojiSuggestionEntityService,
FollowingEntityService,
FollowRequestEntityService,
GalleryLikeEntityService,
Expand Down Expand Up @@ -494,6 +500,7 @@ const $Imports = [
$AvatarDecorationService,
$CaptchaService,
$CustomEmojiService,
$EmojiSuggestionService,
$DeleteAccountService,
$DownloadService,
$DriveService,
Expand Down Expand Up @@ -588,6 +595,7 @@ const $Imports = [
$DriveFileEntityService,
$DriveFolderEntityService,
$EmojiEntityService,
$EmojiSuggestionEntityService,
$FollowingEntityService,
$FollowRequestEntityService,
$GalleryLikeEntityService,
Expand Down Expand Up @@ -654,6 +662,7 @@ const $Imports = [
AvatarDecorationService,
CaptchaService,
CustomEmojiService,
EmojiSuggestionService,
DeleteAccountService,
DownloadService,
DriveService,
Expand Down Expand Up @@ -744,6 +753,7 @@ const $Imports = [
DriveFileEntityService,
DriveFolderEntityService,
EmojiEntityService,
EmojiSuggestionEntityService,
FollowingEntityService,
FollowRequestEntityService,
GalleryLikeEntityService,
Expand Down Expand Up @@ -808,6 +818,7 @@ const $Imports = [
$AvatarDecorationService,
$CaptchaService,
$CustomEmojiService,
$EmojiSuggestionService,
$DeleteAccountService,
$DownloadService,
$DriveService,
Expand Down Expand Up @@ -900,6 +911,7 @@ const $Imports = [
$DriveFileEntityService,
$DriveFolderEntityService,
$EmojiEntityService,
$EmojiSuggestionEntityService,
$FollowingEntityService,
$FollowRequestEntityService,
$GalleryLikeEntityService,
Expand Down
Loading
Loading