From 2f84471a3ee67eba649d67698e97b409648caf31 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Wed, 19 Jan 2022 22:08:19 -0500 Subject: [PATCH 1/6] add missing mentions, fix #399 --- .../stream/status/status.component.ts | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/app/components/stream/status/status.component.ts b/src/app/components/stream/status/status.component.ts index 1c1bbb7f..dd76eae4 100644 --- a/src/app/components/stream/status/status.component.ts +++ b/src/app/components/stream/status/status.component.ts @@ -88,7 +88,8 @@ export class StatusComponent implements OnInit { // const instanceUrl = 'https://' + this.status.uri.split('https://')[1].split('/')[0]; // this.statusAccountName = this.emojiConverter.applyEmojis(this.displayedStatus.account.emojis, this.displayedStatus.account.display_name, EmojiTypeEnum.small); - this.statusContent = this.emojiConverter.applyEmojis(this.displayedStatus.emojis, this.displayedStatus.content, EmojiTypeEnum.medium); + let statusContent = this.emojiConverter.applyEmojis(this.displayedStatus.emojis, this.displayedStatus.content, EmojiTypeEnum.medium); + this.statusContent = this.ensureMentionAreDisplayed(statusContent); } get statusWrapper(): StatusWrapper { return this._statusWrapper; @@ -101,6 +102,22 @@ export class StatusComponent implements OnInit { ngOnInit() { } + private ensureMentionAreDisplayed(data: string): string { + const mentions = this.displayedStatus.mentions; + if(!mentions || mentions.length === 0) return data; + + let textMentions = ''; + for (const m of mentions) { + if(!data.includes(m.url)){ + textMentions += `@${m.username} ` + } + } + if(textMentions !== ''){ + data = textMentions + data; + } + return data; + } + private setContentWarning(status: StatusWrapper) { this.hideStatus = status.hide; this.isContentWarned = status.applyCw; From 59c3b1927132da5ff959a95a7e47678256d93cbc Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Wed, 19 Jan 2022 22:32:50 -0500 Subject: [PATCH 2/6] fix npm version --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8314b742..0a14ebb9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: install: - ps: Install-Product node $env:nodejs_version - set CI=true - - npm install -g npm@latest + - npm install -g npm@6.9.0 - set PATH=%APPDATA%\npm;%PATH% - npm install matrix: From 5c52c9c4f206763ce9e9e932d7cd2890456361c2 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Wed, 19 Jan 2022 22:37:58 -0500 Subject: [PATCH 3/6] bump nodejs version --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0a14ebb9..62058089 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ environment: GH_TOKEN: secure: wRRBU0GXTmTBgZBs2PGSaEJWOflynAyvp3Nc/7e9xmciPfkUCQAXcpOn0jIYmzpb matrix: - - nodejs_version: 10.9.0 + - nodejs_version: 10.16.3 install: - ps: Install-Product node $env:nodejs_version - set CI=true From 7cb08877498e98975e0497946c5e04fbbf94c016 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Wed, 19 Jan 2022 22:39:44 -0500 Subject: [PATCH 4/6] disable cache --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 62058089..74910c9c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,11 @@ os: unstable cache: - - node_modules + #- node_modules environment: GH_TOKEN: secure: wRRBU0GXTmTBgZBs2PGSaEJWOflynAyvp3Nc/7e9xmciPfkUCQAXcpOn0jIYmzpb matrix: - - nodejs_version: 10.16.3 + - nodejs_version: 10.9.0 install: - ps: Install-Product node $env:nodejs_version - set CI=true From 42fb269c243e137afd685da4ffab54a7fceb0daa Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Wed, 19 Jan 2022 23:30:38 -0500 Subject: [PATCH 5/6] road to 1.1.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9fe702e4..185af283 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sengi", - "version": "1.1.4", + "version": "1.1.5", "license": "AGPL-3.0-or-later", "main": "main-electron.js", "description": "A multi-account desktop client for Mastodon and Pleroma", From 04094311055b7b93837cc7e8b2221e646aabf616 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Fri, 21 Jan 2022 21:40:16 -0500 Subject: [PATCH 6/6] removing travis --- .travis.yml | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b79fa31f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,47 +0,0 @@ -sudo: required -dist: trusty - -language: c - -matrix: - include: - - os: osx - - os: linux - env: CC=clang CXX=clang++ npm_config_clang=1 - compiler: clang - -node_js: - - 10.9.0 - -cache: - directories: - - node_modules - -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - icnsutils - - graphicsmagick - - libgnome-keyring-dev - - xz-utils - - xorriso - - xvfb - -install: - - nvm install 10.9.0 - - npm install electron-builder@22.10.5 - - npm install - - npm rebuild node-sass - - export DISPLAY=':99.0' - - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - -before_script: - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start & - - sleep 3 - -script: -- npm run travis