graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 02:03:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse source
This commit is contained in:
syuilo 2023-04-14 19:35:16 +09:00
commit 69adbdef15
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/backend/src/core/activitypub/models/ApNoteService.ts
View file

@ -71,7 +71,7 @@ export class ApNoteService {
}
@bindThis
public validateNote(object: any, uri: string) {
public validateNote(object: IObject, uri: string) {
const expectHost = this.utilityService.extractDbHost(uri);
if (object == null) {
@ -85,9 +85,10 @@ export class ApNoteService {
if (object.id && this.utilityService.extractDbHost(object.id) !== expectHost) {
return new Error(`invalid Note: id has different host. expected: ${expectHost}, actual: ${this.utilityService.extractDbHost(object.id)}`);
}
if (object.attributedTo && this.utilityService.extractDbHost(getOneApId(object.attributedTo)) !== expectHost) {
return new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${this.utilityService.extractDbHost(object.attributedTo)}`);
const actualHost = object.attributedTo && this.utilityService.extractDbHost(getOneApId(object.attributedTo));
if (object.attributedTo && actualHost !== expectHost) {
return new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${actualHost}`);
}
return null;

19
packages/frontend/src/components/MkReactionsViewer.details.vue
View file

@ -10,7 +10,7 @@
<MkAvatar :class="$style.avatar" :user="u"/>
<MkUserName :user="u" :nowrap="true"/>
</div>
<div v-if="users.length > 10">+{{ count - 10 }}</div>
<div v-if="users.length > 10" :class="$style.more">+{{ count - 10 }}</div>
</div>
</div>
</MkTooltip>
@ -50,7 +50,9 @@ function getReactionName(reaction: string): string {
.reaction {
max-width: 100px;
padding-right: 10px;
text-align: center;
border-right: solid 0.5px var(--divider);
}
.reactionIcon {
@ -66,25 +68,20 @@ function getReactionName(reaction: string): string {
}
.users {
contain: content;
flex: 1;
min-width: 0;
margin: -4px 14px 0 10px;
font-size: 0.95em;
border-left: solid 0.5px var(--divider);
padding-left: 10px;
margin-left: 10px;
margin-right: 14px;
text-align: left;
}
.user {
line-height: 24px;
padding-top: 4px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
&:not(:last-child) {
margin-bottom: 3px;
}
}
.avatar {
@ -92,4 +89,8 @@ function getReactionName(reaction: string): string {
height: 24px;
margin-right: 3px;
}
.more {
padding-top: 4px;
}
</style>