added custom emoji support
This commit is contained in:
parent
faa7399d39
commit
58e3f4a34c
|
@ -1,8 +1,5 @@
|
||||||
<emoji-mart
|
<emoji-mart
|
||||||
[showPreview]="false"
|
*ngIf="loaded"
|
||||||
[perLine]="7"
|
[showPreview]="false" [perLine]="7" [isNative]="true" [sheetSize]="16" [emojiTooltip]="true"
|
||||||
[isNative]="true"
|
[custom]="customEmojis" (emojiSelect)="emojiSelected($event)" class="emojipicker" title="Pick your emoji…"
|
||||||
[sheetSize]="16"
|
emoji="point_up"></emoji-mart>
|
||||||
[emojiTooltip]="true"
|
|
||||||
(emojiSelect)="emojiSelected($event)"
|
|
||||||
class="emojipicker" title="Pick your emoji…" emoji="point_up"></emoji-mart>
|
|
|
@ -1,5 +1,9 @@
|
||||||
import { Component, OnInit, HostListener, ElementRef, Output, EventEmitter } from '@angular/core';
|
import { Component, OnInit, HostListener, ElementRef, Output, EventEmitter } from '@angular/core';
|
||||||
|
|
||||||
|
import { ToolsService } from '../../../services/tools.service';
|
||||||
|
import { NotificationService } from '../../../services/notification.service';
|
||||||
|
import { Emoji } from '../../../services/models/mastodon.interfaces';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-emoji-picker',
|
selector: 'app-emoji-picker',
|
||||||
templateUrl: './emoji-picker.component.html',
|
templateUrl: './emoji-picker.component.html',
|
||||||
|
@ -11,7 +15,13 @@ export class EmojiPickerComponent implements OnInit {
|
||||||
@Output('closed') public closedEvent = new EventEmitter();
|
@Output('closed') public closedEvent = new EventEmitter();
|
||||||
@Output('emojiSelected') public emojiSelectedEvent = new EventEmitter<string>();
|
@Output('emojiSelected') public emojiSelectedEvent = new EventEmitter<string>();
|
||||||
|
|
||||||
constructor(private eRef: ElementRef) { }
|
customEmojis: PickerCustomEmoji[] = [];
|
||||||
|
loaded: boolean;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private notificationService: NotificationService,
|
||||||
|
private toolsService: ToolsService,
|
||||||
|
private eRef: ElementRef) { }
|
||||||
|
|
||||||
@HostListener('document:click', ['$event'])
|
@HostListener('document:click', ['$event'])
|
||||||
clickout(event) {
|
clickout(event) {
|
||||||
|
@ -23,13 +33,44 @@ export class EmojiPickerComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
let currentAccount = this.toolsService.getSelectedAccounts()[0];
|
||||||
|
this.toolsService.getCustomEmojis(currentAccount)
|
||||||
|
.then(emojis => {
|
||||||
|
console.warn(emojis);
|
||||||
|
this.customEmojis = emojis.map(x => this.convertEmoji(x));
|
||||||
|
})
|
||||||
|
.catch(err => {
|
||||||
|
this.notificationService.notifyHttpError(err);
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
this.loaded = true;
|
||||||
|
});
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.init = true;
|
this.init = true;
|
||||||
}, 0);
|
}, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private convertEmoji(emoji: Emoji): PickerCustomEmoji {
|
||||||
|
return new PickerCustomEmoji(emoji.shortcode, [emoji.shortcode], emoji.shortcode, [emoji.shortcode], emoji.url);
|
||||||
|
}
|
||||||
|
|
||||||
emojiSelected(select: any): boolean {
|
emojiSelected(select: any): boolean {
|
||||||
|
if (select.emoji.custom) {
|
||||||
|
this.emojiSelectedEvent.next(select.emoji.colons);
|
||||||
|
} else {
|
||||||
this.emojiSelectedEvent.next(select.emoji.native);
|
this.emojiSelectedEvent.next(select.emoji.native);
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class PickerCustomEmoji {
|
||||||
|
constructor(
|
||||||
|
public name: string,
|
||||||
|
public shortNames: string[],
|
||||||
|
public text: string,
|
||||||
|
public keywords: string[],
|
||||||
|
public imageUrl: string) {
|
||||||
|
}
|
||||||
|
}
|
|
@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
|
||||||
import { HttpHeaders, HttpClient, HttpResponse } from '@angular/common/http';
|
import { HttpHeaders, HttpClient, HttpResponse } from '@angular/common/http';
|
||||||
|
|
||||||
import { ApiRoutes } from './models/api.settings';
|
import { ApiRoutes } from './models/api.settings';
|
||||||
import { Account, Status, Results, Context, Relationship, Instance, Attachment, Notification, List, Poll } from "./models/mastodon.interfaces";
|
import { Account, Status, Results, Context, Relationship, Instance, Attachment, Notification, List, Poll, Emoji } from "./models/mastodon.interfaces";
|
||||||
import { AccountInfo } from '../states/accounts.state';
|
import { AccountInfo } from '../states/accounts.state';
|
||||||
import { StreamTypeEnum, StreamElement } from '../states/streams.state';
|
import { StreamTypeEnum, StreamElement } from '../states/streams.state';
|
||||||
|
|
||||||
|
@ -368,6 +368,11 @@ export class MastodonService {
|
||||||
const headers = new HttpHeaders({ 'Authorization': `Bearer ${account.token.access_token}` });
|
const headers = new HttpHeaders({ 'Authorization': `Bearer ${account.token.access_token}` });
|
||||||
return this.httpClient.delete<any>(route, { headers: headers }).toPromise();
|
return this.httpClient.delete<any>(route, { headers: headers }).toPromise();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getCustomEmojis(account: AccountInfo): Promise<Emoji[]> {
|
||||||
|
let route = `https://${account.instance}${this.apiRoutes.getCustomEmojis}`;
|
||||||
|
return this.httpClient.get<Emoji[]>(route).toPromise();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum VisibilityEnum {
|
export enum VisibilityEnum {
|
||||||
|
|
|
@ -3,6 +3,7 @@ export class ApiRoutes {
|
||||||
createApp = '/api/v1/apps';
|
createApp = '/api/v1/apps';
|
||||||
getToken = '/oauth/token';
|
getToken = '/oauth/token';
|
||||||
getAccount = '/api/v1/accounts/{0}';
|
getAccount = '/api/v1/accounts/{0}';
|
||||||
|
getCustomEmojis = '/api/v1/custom_emojis';
|
||||||
getCurrentAccount = '/api/v1/accounts/verify_credentials';
|
getCurrentAccount = '/api/v1/accounts/verify_credentials';
|
||||||
getAccountFollowers = '/api/v1/accounts/{0}/followers';
|
getAccountFollowers = '/api/v1/accounts/{0}/followers';
|
||||||
getAccountFollowing = '/api/v1/accounts/{0}/following';
|
getAccountFollowing = '/api/v1/accounts/{0}/following';
|
||||||
|
|
|
@ -3,7 +3,7 @@ import { Store } from '@ngxs/store';
|
||||||
|
|
||||||
import { AccountInfo } from '../states/accounts.state';
|
import { AccountInfo } from '../states/accounts.state';
|
||||||
import { MastodonService } from './mastodon.service';
|
import { MastodonService } from './mastodon.service';
|
||||||
import { Account, Results, Status } from "./models/mastodon.interfaces";
|
import { Account, Results, Status, Emoji } from "./models/mastodon.interfaces";
|
||||||
import { StatusWrapper } from '../models/common.model';
|
import { StatusWrapper } from '../models/common.model';
|
||||||
import { AccountSettings, SaveAccountSettings } from '../states/settings.state';
|
import { AccountSettings, SaveAccountSettings } from '../states/settings.state';
|
||||||
|
|
||||||
|
@ -82,6 +82,15 @@ export class ToolsService {
|
||||||
}
|
}
|
||||||
return `@${fullHandle}`;
|
return `@${fullHandle}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getCustomEmojis(account: AccountInfo): Promise<Emoji[]> {
|
||||||
|
//TODO: add cache
|
||||||
|
|
||||||
|
return this.mastodonService.getCustomEmojis(account)
|
||||||
|
.then(emojis => {
|
||||||
|
return emojis.filter(x => x.visible_in_picker);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class OpenThreadEvent {
|
export class OpenThreadEvent {
|
||||||
|
|
Loading…
Reference in New Issue