grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Using a proper twitter emoji list for the definitions.

Browse source 
- Fixes #260
This commit is contained in:
Dessalines 2019-09-02 15:55:50 -07:00
parent d99fa5268d
commit f538b3fb22
4 changed files with 1729 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ui/src/components/comment-form.tsx vendored
View file

@ -1,7 +1,8 @@
import { Component, linkEvent } from 'inferno'; import { Component, linkEvent } from 'inferno';
import { CommentNode as CommentNodeI, CommentForm as CommentFormI, SearchForm, SearchType, SortType, UserOperation, SearchResponse } from '../interfaces'; import { CommentNode as CommentNodeI, CommentForm as CommentFormI, SearchForm, SearchType, SortType, UserOperation, SearchResponse } from '../interfaces';
import { Subscription } from "rxjs"; import { Subscription } from "rxjs";
import { capitalizeFirstLetter, mentionDropdownFetchLimit, msgOp, md, emojiMentionList, mdToHtml, randomStr, imageUploadUrl, markdownHelpUrl } from '../utils'; import { capitalizeFirstLetter, mentionDropdownFetchLimit, msgOp, mdToHtml, randomStr, imageUploadUrl, markdownHelpUrl } from '../utils';
import { twemojis } from '../twemojis';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import * as autosize from 'autosize'; import * as autosize from 'autosize';
import { i18n } from '../i18next'; import { i18n } from '../i18next';
@ -49,12 +50,12 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> {
trigger: ':', trigger: ':',
menuItemTemplate: (item: any) => { menuItemTemplate: (item: any) => {
let emoji = `:${item.original.key}:`; let emoji = `:${item.original.key}:`;
return `${md.renderInline(emoji)} ${emoji}`; return `${item.original.val} ${emoji}`;
}, },
selectTemplate: (item: any) => { selectTemplate: (item: any) => {
return `:${item.original.key}:`; return `:${item.original.key}:`;
}, },
values: emojiMentionList(), values: Object.entries(twemojis).map(e => {return {'key': e[0], 'val': e[1]}}),
allowSpaces: false, allowSpaces: false,
autocompleteMode: true, autocompleteMode: true,
menuItemLimit: 10, menuItemLimit: 10,

1
ui/src/emoji_list.ts vendored
View file

File diff suppressed because one or more lines are too long

1721
ui/src/twemojis.ts vendored Normal file
View file

File diff suppressed because it is too large Load diff

15
ui/src/utils.ts vendored
View file

@ -11,8 +11,8 @@ import { UserOperation, Comment, User, SortType, ListingType } from './interface
import * as markdown_it from 'markdown-it'; import * as markdown_it from 'markdown-it';
declare var markdownitEmoji: any; declare var markdownitEmoji: any;
import * as markdown_it_container from 'markdown-it-container'; import * as markdown_it_container from 'markdown-it-container';
import { emoji_list } from './emoji_list';
import * as twemoji from 'twemoji'; import * as twemoji from 'twemoji';
import { twemojis } from './twemojis';
export const repoUrl = 'https://github.com/dessalines/lemmy'; export const repoUrl = 'https://github.com/dessalines/lemmy';
export const imageUploadUrl = 'https://postimages.org/'; export const imageUploadUrl = 'https://postimages.org/';
@ -49,7 +49,9 @@ export const md = new markdown_it({
return '</details>\n'; return '</details>\n';
} }
} }
}).use(markdownitEmoji); }).use(markdownitEmoji, {
defs: twemojis
});
md.renderer.rules.emoji = function(token, idx) { md.renderer.rules.emoji = function(token, idx) {
return twemoji.parse(token[idx].content); return twemoji.parse(token[idx].content);
@ -195,15 +197,6 @@ export function getLanguage(): string {
return (navigator.language || navigator.userLanguage); return (navigator.language || navigator.userLanguage);
} }
export function emojiMentionList(): Array<{}> {
let keyedEmojis = [];
for (let e of emoji_list) {
let obj = {key: e};
keyedEmojis.push(obj);
}
return keyedEmojis;
}
export function getMomentLanguage(): string { export function getMomentLanguage(): string {
let lang = getLanguage(); let lang = getLanguage();
if (lang.startsWith('zh')) { if (lang.startsWith('zh')) {