Merge branch 'develop' of https://codeberg.org/calckey/calckey into feat/module-player

packages/backend/src/misc/nyaize.ts

@@ -20,5 +20,11 @@ export function nyaize(text: string): string {
 			)
 			.replace(/(다$)|(다(?=\.))|(다(?= ))|(다(?=!))|(다(?=\?))/gm, "다냥")
 			.replace(/(야(?=\?))|(야$)|(야(?= ))/gm, "냥")
+			// zh-CN, zh-TW
+			.replace(/(妙|庙|描|渺|瞄|秒|苗|藐|廟)/g, "喵")
+			// el-GR
+			.replaceAll("να", "νια")
+			.replaceAll("ΝΑ", "ΝΙΑ")
+			.replaceAll("Να", "Νια")
 	);
 }

packages/backend/src/server/api/endpoints/notes/show.ts

@@ -21,6 +21,7 @@ export const meta = {
 			message: "No such note.",
 			code: "NO_SUCH_NOTE",
 			id: "24fcbfc6-2e37-42b6-8388-c29b3861a08d",
+			httpStatusCode: 404,
 		},
 	},
 } as const;

packages/backend/src/server/api/mastodon/endpoints/meta.ts

@@ -1,4 +1,5 @@
 import { Entity } from "megalodon";
+import config from "@/config/index.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 import { Users, Notes } from "@/models/index.js";
 import { IsNull, MoreThan } from "typeorm";
@@ -17,7 +18,7 @@ export async function getInstance(response: Entity.Instance) {
 			response.description ||
 			"This is a vanilla Calckey Instance. It doesnt seem to have a description. BTW you are using the Mastodon api to access this server :)",
 		email: response.email || "",
-		version: "3.0.0 compatible (3.5+ Calckey)", //I hope this version string is correct, we will need to test it.
+		version: `3.0.0 (compatible; Calckey ${config.version})`,
 		urls: response.urls,
 		stats: {
 			user_count: await totalUsers,

packages/backend/src/server/api/mastodon/endpoints/status.ts

@@ -67,6 +67,25 @@ export function apiStatusMastodon(router: Router): void {
 			const { sensitive } = body;
 			body.sensitive =
 				typeof sensitive === "string" ? sensitive === "true" : sensitive;
+
+			if (body.poll) {
+				if (
+					body.poll.expires_in != null &&
+					typeof body.poll.expires_in === "string"
+				)
+					body.poll.expires_in = parseInt(body.poll.expires_in);
+				if (
+					body.poll.multiple != null &&
+					typeof body.poll.multiple === "string"
+				)
+					body.poll.multiple = body.poll.multiple == "true";
+				if (
+					body.poll.hide_totals != null &&
+					typeof body.poll.hide_totals === "string"
+				)
+					body.poll.hide_totals = body.poll.hide_totals == "true";
+			}
+
 			const data = await client.postStatus(text, body);
 			ctx.body = convertStatus(data.data);
 		} catch (e: any) {
@@ -86,7 +105,7 @@ export function apiStatusMastodon(router: Router): void {
 			ctx.body = convertStatus(data.data);
 		} catch (e: any) {
 			console.error(e);
-			ctx.status = 401;
+			ctx.status = ctx.status == 404 ? 404 : 401;
 			ctx.body = e.response.data;
 		}
 	});

packages/client/src/components/MkUrlPreview.vue

@@ -196,6 +196,7 @@ onUnmounted(() => {
 	> a {
 		display: flex;
 		transition: background 0.2s;
+		text-decoration: none;
 		> div:first-child:not(:last-child) {
 			position: relative;
 			width: 90px;
@@ -277,7 +278,7 @@ onUnmounted(() => {
 		&:focus,
 		&:focus-within {
 			background: var(--panelHighlight);
-			h1 {
+			h3 {
 				text-decoration: underline;
 			}
 		}

packages/client/src/components/global/MkUrl.vue

@@ -80,6 +80,8 @@ const target = self ? null : "_blank";
 	display: inline-block;
 	overflow: clip;
 	text-overflow: ellipsis;
+	text-decoration: none !important;
+	line-height: 1.05;
 
 	> .icon {
 		padding-left: 2px;

packages/client/src/components/mfm.ts

@@ -409,6 +409,7 @@ export default defineComponent({
 										key: Math.random(),
 										to: `/tags/${encodeURIComponent(token.props.hashtag)}`,
 										style: "color:var(--hashtag);",
+										class: "_link",
 									},
 									`#${token.props.hashtag}`,
 								),

packages/client/src/style.scss

@@ -145,6 +145,9 @@ a {
 	cursor: pointer;
 	color: inherit;
 	-webkit-tap-highlight-color: transparent;
+	&:hover {
+		text-decoration: underline;
+	}
 }
 
 // i {
@@ -229,6 +232,7 @@ hr {
 	font-size: 1em;
 	font-family: inherit;
 	line-height: inherit;
+	text-decoration: none;
 
 	&,
 	* {
@@ -628,18 +632,22 @@ hr {
 ._link {
 	position: relative;
 	color: var(--link);
+	text-decoration: none !important;
 
-	&:after {
+	&::before, &::after {
 		content: "";
 		position: absolute;
 		bottom: 0;
 		left: 0;
 		width: 0%;
-		border-bottom: 2px solid var(--link);
+		border-bottom: 1px solid var(--link);
 		transition: 0.3s ease-in-out;
 	}
-
-	&:hover:after {
+	&::before {
+		width: 100%;
+		opacity: .4;
+	}
+	&:hover:after, &:focus:after {
 		width: 100%;
 	}
 }

packages/megalodon/src/misskey.ts

@@ -408,7 +408,7 @@ export default class Misskey implements MegalodonInterface {
     if (options) {
       if (options.limit) {
         params = Object.assign(params, {
-          limit: options.limit
+					limit: options.limit <= 100 ? options.limit : 100
         })
       }
       if (options.max_id) {
@@ -738,7 +738,7 @@ export default class Misskey implements MegalodonInterface {
     if (options) {
       if (options.limit) {
         params = Object.assign(params, {
-          limit: options.limit
+					limit: options.limit <= 100 ? options.limit : 100
         })
       }
       else {
@@ -1169,7 +1169,7 @@ export default class Misskey implements MegalodonInterface {
         let pollParam = {
           choices: options.poll.options,
           expiresAt: null,
-          expiredAfter: options.poll.expires_in
+          expiredAfter: options.poll.expires_in * 1000
         }
         if (options.poll.multiple !== undefined) {
           pollParam = Object.assign(pollParam, {
@@ -1236,14 +1236,24 @@ export default class Misskey implements MegalodonInterface {
 		const notification = this.converter.notification(n, host);
 		if (n.note)
 			notification.status = await this.noteWithDetails(n.note, host, cache);
+		if (notification.account)
+			notification.account = (await this.getAccount(notification.account.id)).data
 		return notification;
 	}
 
   public async noteWithDetails(n: MisskeyAPI.Entity.Note, host: string, cache: AccountCache): Promise<MegalodonEntity.Status> {
     const status = await this.addUserDetailsToStatus(this.converter.note(n, host), cache);
+		status.bookmarked = await this.isStatusBookmarked(n.id);
     return this.addMentionsToStatus(status, cache);
   }
 
+	public async isStatusBookmarked(id: string) : Promise<boolean> {
+		return this.client
+			.post<MisskeyAPI.Entity.State>('/api/notes/state', {
+				noteId: id
+			}).then(p => p.data.isFavorited ?? false);
+	}
+
 	public async addUserDetailsToStatus(status: Entity.Status, cache: AccountCache) : Promise<Entity.Status> {
 		if (status.account.followers_count === 0 && status.account.followers_count === 0 && status.account.statuses_count === 0)
 			status.account = await this.getAccountCached(status.account.id, status.account.acct, cache) ?? status.account;

packages/megalodon/src/misskey/api_client.ts

@@ -40,7 +40,8 @@ namespace MisskeyAPI {
     export type GetAll = MisskeyEntity.GetAll
     export type UserKey = MisskeyEntity.UserKey
     export type Session = MisskeyEntity.Session
-    export type Stats = MisskeyEntity.Stats
+		export type Stats = MisskeyEntity.Stats
+		export type State = MisskeyEntity.State
     export type APIEmoji = { emojis: Emoji[] }
   }
 
@@ -396,8 +397,8 @@ namespace MisskeyAPI {
           return MisskeyNotificationType.Reaction
         case NotificationType.Reblog:
           return MisskeyNotificationType.Renote
-        case NotificationType.PollVote:
-          return MisskeyNotificationType.PollVote
+				case NotificationType.Poll:
+					return MisskeyNotificationType.PollEnded
         case NotificationType.FollowRequest:
           return MisskeyNotificationType.ReceiveFollowRequest
         default:
@@ -417,8 +418,8 @@ namespace MisskeyAPI {
           return NotificationType.Reblog
         case MisskeyNotificationType.Reaction:
           return NotificationType.EmojiReaction
-        case MisskeyNotificationType.PollVote:
-          return NotificationType.PollVote
+				case MisskeyNotificationType.PollEnded:
+					return NotificationType.Poll
         case MisskeyNotificationType.ReceiveFollowRequest:
           return NotificationType.FollowRequest
         case MisskeyNotificationType.FollowRequestAccepted:
@@ -458,6 +459,11 @@ namespace MisskeyAPI {
         notification = Object.assign(notification, {
           status: this.note(n.note, host)
         })
+				if (notification.type === NotificationType.Poll) {
+					notification = Object.assign(notification, {
+						account: this.note(n.note, host).account
+					})
+				}
       }
       if (n.reaction) {
         notification = Object.assign(notification, {

packages/megalodon/src/misskey/entities/state.ts

@@ -0,0 +1,7 @@
+namespace MisskeyEntity {
+  export type State = {
+    isFavorited: boolean
+		isMutedThread: boolean
+		isWatching: boolean
+  }
+}

packages/megalodon/src/misskey/notification.ts

@@ -7,7 +7,7 @@ namespace MisskeyNotificationType {
   export const Renote: MisskeyEntity.NotificationType = 'renote'
   export const Quote: MisskeyEntity.NotificationType = 'quote'
   export const Reaction: MisskeyEntity.NotificationType = 'favourite'
-  export const PollVote: MisskeyEntity.NotificationType = 'pollVote'
+	export const PollEnded: MisskeyEntity.NotificationType = 'pollEnded'
   export const ReceiveFollowRequest: MisskeyEntity.NotificationType = 'receiveFollowRequest'
   export const FollowRequestAccepted: MisskeyEntity.NotificationType = 'followRequestAccepted'
   export const GroupInvited: MisskeyEntity.NotificationType = 'groupInvited'

packages/megalodon/src/notification.ts

@@ -8,8 +8,7 @@ namespace NotificationType {
   export const EmojiReaction: Entity.NotificationType = 'emoji_reaction'
   export const FollowRequest: Entity.NotificationType = 'follow_request'
   export const Status: Entity.NotificationType = 'status'
-  export const PollVote: Entity.NotificationType = 'poll_vote'
-  export const PollExpired: Entity.NotificationType = 'poll_expired'
+  export const Poll: Entity.NotificationType = 'poll'
 }
 
 export default NotificationType

packages/megalodon/test/integration/misskey.spec.ts

@@ -93,7 +93,7 @@ const pollVote: MisskeyEntity.Notification = {
   createdAt: '2021-02-01T01:49:29',
   userId: user.id,
   user: user,
-  type: MisskeyNotificationType.PollVote,
+  type: MisskeyNotificationType.PollEnded,
   note: note
 }
 
@@ -168,7 +168,7 @@ describe('getNotifications', () => {
     },
     {
       event: pollVote,
-      expected: MegalodonNotificationType.PollVote,
+      expected: MegalodonNotificationType.Poll,
       title: 'pollVote'
     },
     {

packages/megalodon/test/unit/misskey/api_client.spec.ts

@@ -42,8 +42,8 @@ describe('api_client', () => {
             dist: MisskeyNotificationType.Renote
           },
           {
-            src: MegalodonNotificationType.PollVote,
-            dist: MisskeyNotificationType.PollVote
+            src: MegalodonNotificationType.Poll,
+            dist: MisskeyNotificationType.PollEnded
           },
           {
             src: MegalodonNotificationType.FollowRequest,
@@ -83,8 +83,8 @@ describe('api_client', () => {
             dist: MegalodonNotificationType.EmojiReaction
           },
           {
-            src: MisskeyNotificationType.PollVote,
-            dist: MegalodonNotificationType.PollVote
+            src: MisskeyNotificationType.PollEnded,
+            dist: MegalodonNotificationType.Poll
           },
           {
             src: MisskeyNotificationType.ReceiveFollowRequest,