fix: ログインしないとタイムラインを見られないようにする

nacika-ins · May 13, 2024 · 163024d · 163024d
1 parent 6b3779a
commit 163024d
Show file tree

Hide file tree

Showing 8 changed files with 441 additions and 385 deletions.
diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts
@@ -8,7 +8,7 @@ import { DI } from '@/di-symbols.js';
 export const meta = {
 	tags: ['notes'],
 
-	requireCredential: false,
+	requireCredential: true,
 	allowGet: true,
 	cacheSec: 3600,
 

diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -12,6 +12,8 @@ import { ApiError } from '../../error.js';
 export const meta = {
 	tags: ['notes'],
 
+  requireCredential: true,
+
 	res: {
 		type: 'array',
 		optional: false, nullable: false,

diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -14,6 +14,8 @@ import { ApiError } from '../../error.js';
 export const meta = {
 	tags: ['notes'],
 
+  requireCredential: true,
+
 	res: {
 		type: 'array',
 		optional: false, nullable: false,

diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -13,7 +13,7 @@ import { ApiError } from '../../error.js';
 export const meta = {
 	tags: ['notes'],
 
-	requireCredential: false,
+	requireCredential: true,
 
 	res: {
 		type: 'array',

diff --git a/packages/frontend/src/pages/about.emojis.vue b/packages/frontend/src/pages/about.emojis.vue
@@ -1,110 +1,132 @@
 <template>
-<div class="driuhtrh _gaps">
-	<MkButton v-if="$i && ($i.isModerator || $i.policies.canManageCustomEmojis)" primary link to="/custom-emojis-manager">{{ i18n.ts.manageCustomEmojis }}</MkButton>
-
-	<div class="query">
-		<MkInput v-model="q" class="" :placeholder="$ts.search">
-			<template #prefix><i class="ti ti-search"></i></template>
-		</MkInput>
-
-		<!-- たくさんあると邪魔
-		<div class="tags">
-			<span class="tag _button" v-for="tag in customEmojiTags" :class="{ active: selectedTags.has(tag) }" @click="toggleTag(tag)">{{ tag }}</span>
-		</div>
-		-->
-	</div>
-
-	<MkFoldableSection v-if="searchEmojis" class="emojis">
-		<template #header>{{ $ts.searchResult }}</template>
-		<div class="zuvgdzyt">
-			<XEmoji v-for="emoji in searchEmojis" :key="emoji.name" class="emoji" :emoji="emoji"/>
-		</div>
-	</MkFoldableSection>
-
-	<MkFoldableSection v-for="category in customEmojiCategories" v-once :key="category" class="emojis">
-		<template #header>{{ category || $ts.other }}</template>
-		<div class="zuvgdzyt">
-			<XEmoji v-for="emoji in customEmojis.filter(e => e.category === category)" :key="emoji.name" class="emoji" :emoji="emoji"/>
-		</div>
-	</MkFoldableSection>
-</div>
+  <div v-if="$i">
+    <div class="driuhtrh _gaps">
+      <MkButton
+        v-if="$i && ($i.isModerator || $i.policies.canManageCustomEmojis)"
+        primary
+        link
+        to="/custom-emojis-manager"
+      >
+        {{ i18n.ts.manageCustomEmojis }}
+      </MkButton>
+
+      <div class="query">
+        <MkInput v-model="q" class="" :placeholder="$ts.search">
+          <template #prefix><i class="ti ti-search"></i></template>
+        </MkInput>
+
+        <!-- たくさんあると邪魔
+        <div class="tags">
+          <span class="tag _button" v-for="tag in customEmojiTags" :class="{ active: selectedTags.has(tag) }" @click="toggleTag(tag)">{{ tag }}</span>
+        </div>
+        -->
+      </div>
+
+      <MkFoldableSection v-if="searchEmojis" class="emojis">
+        <template #header>{{ $ts.searchResult }}</template>
+        <div class="zuvgdzyt">
+          <XEmoji v-for="emoji in searchEmojis" :key="emoji.name" class="emoji" :emoji="emoji" />
+        </div>
+      </MkFoldableSection>
+
+      <MkFoldableSection v-for="category in customEmojiCategories" v-once :key="category" class="emojis">
+        <template #header>{{ category || $ts.other }}</template>
+        <div class="zuvgdzyt">
+          <XEmoji
+            v-for="emoji in customEmojis.filter((e) => e.category === category)"
+            :key="emoji.name"
+            class="emoji"
+            :emoji="emoji"
+          />
+        </div>
+      </MkFoldableSection>
+    </div>
+  </div>
 </template>
 
 <script lang="ts" setup>
 import { watch } from 'vue';
+import * as Misskey from 'misskey-js';
 import XEmoji from './emojis.emoji.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
 import { customEmojis, customEmojiCategories, getCustomEmojiTags } from '@/custom-emojis';
 import { i18n } from '@/i18n';
-import * as Misskey from 'misskey-js';
 
 const customEmojiTags = getCustomEmojiTags();
 let q = $ref('');
 let searchEmojis = $ref<Misskey.entities.CustomEmoji[]>(null);
 let selectedTags = $ref(new Set());
 
 function search() {
-	if ((q === '' || q == null) && selectedTags.size === 0) {
-		searchEmojis = null;
-		return;
-	}
-
-	if (selectedTags.size === 0) {
-		searchEmojis = customEmojis.value.filter(emoji => emoji.name.includes(q) || emoji.aliases.includes(q));
-	} else {
-		searchEmojis = customEmojis.value.filter(emoji => (emoji.name.includes(q) || emoji.aliases.includes(q)) && [...selectedTags].every(t => emoji.aliases.includes(t)));
-	}
+  if ((q === '' || q == null) && selectedTags.size === 0) {
+    searchEmojis = null;
+    return;
+  }
+
+  if (selectedTags.size === 0) {
+    searchEmojis = customEmojis.value.filter((emoji) => emoji.name.includes(q) || emoji.aliases.includes(q));
+  } else {
+    searchEmojis = customEmojis.value.filter(
+      (emoji) =>
+        (emoji.name.includes(q) || emoji.aliases.includes(q)) &&
+        [...selectedTags].every((t) => emoji.aliases.includes(t)),
+    );
+  }
 }
 
 function toggleTag(tag) {
-	if (selectedTags.has(tag)) {
-		selectedTags.delete(tag);
-	} else {
-		selectedTags.add(tag);
-	}
+  if (selectedTags.has(tag)) {
+    selectedTags.delete(tag);
+  } else {
+    selectedTags.add(tag);
+  }
 }
 
 watch($$(q), () => {
-	search();
+  search();
 });
 
-watch($$(selectedTags), () => {
-	search();
-}, { deep: true });
+watch(
+  $$(selectedTags),
+  () => {
+    search();
+  },
+  { deep: true },
+);
 </script>
 
 <style lang="scss" scoped>
 .driuhtrh {
-	background: var(--bg);
-
-	> .query {
-		background: var(--bg);
-
-		> .tags {
-			> .tag {
-				display: inline-block;
-				margin: 8px 8px 0 0;
-				padding: 4px 8px;
-				font-size: 0.9em;
-				background: var(--accentedBg);
-				border-radius: 5px;
-
-				&.active {
-					background: var(--accent);
-					color: var(--fgOnAccent);
-				}
-			}
-		}
-	}
-
-	> .emojis {
-		.zuvgdzyt {
-			display: grid;
-			grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
-			grid-gap: 12px;
-		}
-	}
+  background: var(--bg);
+
+  > .query {
+    background: var(--bg);
+
+    > .tags {
+      > .tag {
+        display: inline-block;
+        margin: 8px 8px 0 0;
+        padding: 4px 8px;
+        font-size: 0.9em;
+        background: var(--accentedBg);
+        border-radius: 5px;
+
+        &.active {
+          background: var(--accent);
+          color: var(--fgOnAccent);
+        }
+      }
+    }
+  }
+
+  > .emojis {
+    .zuvgdzyt {
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
+      grid-gap: 12px;
+    }
+  }
 }
 </style>
diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue
@@ -131,11 +131,6 @@ const headerTabs = $computed(() => [
     key: 'overview',
     title: i18n.ts.overview,
   },
-  {
-    key: 'emojis',
-    title: i18n.ts.customEmojis,
-    icon: 'ti ti-icons',
-  },
   {
     key: 'federation',
     title: i18n.ts.federation,