aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-11-25 15:11:57 +0100
committerChocobozzz <me@florianbigard.com>2020-11-25 15:11:57 +0100
commitd07b2944dbbe4877311a68b3960c04b0173957f0 (patch)
tree12a5af7b5eab5fc891cc2a829019e6b93030009a
parenta9d4c3c8ca07e3f7793c9e55a8fa2d0fa8ee56df (diff)
downloadPeerTube-d07b2944dbbe4877311a68b3960c04b0173957f0.tar.gz
PeerTube-d07b2944dbbe4877311a68b3960c04b0173957f0.tar.zst
PeerTube-d07b2944dbbe4877311a68b3960c04b0173957f0.zip
Fix comment account external URL
It did not work, and I think it's better to target the local account page anyway
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment.component.html20
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment.component.scss8
-rw-r--r--server/models/activitypub/actor.ts1
3 files changed, 19 insertions, 10 deletions
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment.component.html b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
index c4b2cd117..8847753a5 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
@@ -21,18 +21,20 @@
21 21
22 <div class="comment-account-date"> 22 <div class="comment-account-date">
23 <div class="comment-account"> 23 <div class="comment-account">
24 <a 24 <a [routerLink]="[ '/accounts', comment.by ]">
25 [routerLink]="[ '/accounts', comment.by ]" 25 <span class="comment-account-name" [ngClass]="{ 'video-author': video.account.id === comment.account.id }">
26 class="comment-account-name" [ngClass]="{ 'video-author': video.account.id === comment.account.id }" 26 {{ comment.account.displayName }}
27 > 27 </span>
28 {{ comment.account.displayName }}
29 </a>
30 28
31 <a [href]="comment.account.url" target="_blank" rel="noopener noreferrer" class="comment-account-fid ml-1">{{ comment.by }}</a> 29 <span class="comment-account-fid ml-1">{{ comment.by }}</span>
30 </a>
32 </div> 31 </div>
33 <a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]" 32
34 class="comment-date" [title]="comment.createdAt">{{ comment.createdAt | myFromNow }}</a> 33 <a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]" class="comment-date" [title]="comment.createdAt">
34 {{ comment.createdAt | myFromNow }}
35 </a>
35 </div> 36 </div>
37
36 <div 38 <div
37 class="comment-html" 39 class="comment-html"
38 [innerHTML]="sanitizedCommentHTML" 40 [innerHTML]="sanitizedCommentHTML"
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment.component.scss b/client/src/app/+videos/+video-watch/comment/video-comment.component.scss
index 61fd24c70..f6ff376b9 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment.component.scss
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.scss
@@ -71,6 +71,10 @@
71 @include disable-default-a-behaviour; 71 @include disable-default-a-behaviour;
72 72
73 color: pvar(--mainForegroundColor); 73 color: pvar(--mainForegroundColor);
74
75 &:hover {
76 text-decoration: underline;
77 }
74 } 78 }
75 79
76 .comment-account-fid { 80 .comment-account-fid {
@@ -83,6 +87,10 @@
83 color: pvar(--greyForegroundColor); 87 color: pvar(--greyForegroundColor);
84 margin-left: 5px; 88 margin-left: 5px;
85 text-decoration: none; 89 text-decoration: none;
90
91 &:hover {
92 text-decoration: underline;
93 }
86 } 94 }
87 } 95 }
88 96
diff --git a/server/models/activitypub/actor.ts b/server/models/activitypub/actor.ts
index b6dacc534..a2fee0012 100644
--- a/server/models/activitypub/actor.ts
+++ b/server/models/activitypub/actor.ts
@@ -62,7 +62,6 @@ export const unusedActorAttributesForAPI = [
62 'sharedInboxUrl', 62 'sharedInboxUrl',
63 'followersUrl', 63 'followersUrl',
64 'followingUrl', 64 'followingUrl',
65 'url',
66 'createdAt', 65 'createdAt',
67 'updatedAt' 66 'updatedAt'
68] 67]