Merge pull request 'develop' (#9015) from develop into main

Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9015
This commit is contained in:
Kainoa Kanter 2022-07-26 23:37:46 +02:00
commit 0fc1ddad3e
6 changed files with 43 additions and 25 deletions

View file

@ -9,6 +9,7 @@ COPY . ./
RUN apt-get update RUN apt-get update
RUN apt-get install -y build-essential RUN apt-get install -y build-essential
RUN git submodule update --init RUN git submodule update --init
RUN yarn set version berry
RUN yarn install RUN yarn install
RUN yarn build RUN yarn build
RUN rm -rf .git RUN rm -rf .git

View file

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "12.118.0-calc.3.b4", "version": "12.118.0-calc.7.b4",
"codename": "indigo", "codename": "indigo",
"repository": { "repository": {
"type": "git", "type": "git",

View file

@ -21,7 +21,7 @@ const modal = ref<InstanceType<typeof MkModal>>();
const whatIsNew = () => { const whatIsNew = () => {
modal.value.close(); modal.value.close();
window.open(`https://misskey-hub.net/docs/releases.html#_${version.replace(/\./g, '-')}`, '_blank'); window.open('https://codeberg.org/thatonecalculator/calckey/releases', '_blank');
}; };
</script> </script>

View file

@ -237,6 +237,7 @@ import { getAccountFromId } from '@/scripts/get-account-from-id';
// テーマリビルドするため // テーマリビルドするため
localStorage.removeItem('theme'); localStorage.removeItem('theme');
/*
try { // 変なバージョン文字列来るとcompareVersionsでエラーになるため try { // 変なバージョン文字列来るとcompareVersionsでエラーになるため
if (lastVersion != null && compareVersions(version, lastVersion) === 1) { if (lastVersion != null && compareVersions(version, lastVersion) === 1) {
// ログインしてる場合だけ // ログインしてる場合だけ
@ -246,6 +247,7 @@ import { getAccountFromId } from '@/scripts/get-account-from-id';
} }
} catch (err) { } catch (err) {
} }
*/
} }
// NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため) // NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)

View file

@ -94,6 +94,7 @@ import * as os from '@/os';
import number from '@/filters/number'; import number from '@/filters/number';
import { i18n } from '@/i18n'; import { i18n } from '@/i18n';
import { definePageMetadata } from '@/scripts/page-metadata'; import { definePageMetadata } from '@/scripts/page-metadata';
import { iAmModerator } from '@/account';
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
initialTab?: string; initialTab?: string;
@ -111,22 +112,30 @@ const initStats = () => os.api('stats', {
const headerActions = $computed(() => []); const headerActions = $computed(() => []);
const headerTabs = $computed(() => [{ let theTabs = [{
key: 'overview', key: 'overview',
title: i18n.ts.overview, title: i18n.ts.overview,
}, { }, {
key: 'emojis', key: 'emojis',
title: i18n.ts.customEmojis, title: i18n.ts.customEmojis,
icon: 'fas fa-laugh', icon: 'fas fa-laugh',
}, {
key: 'federation',
title: i18n.ts.federation,
icon: 'fas fa-globe',
}, { }, {
key: 'charts', key: 'charts',
title: i18n.ts.charts, title: i18n.ts.charts,
icon: 'fas fa-chart-simple', icon: 'fas fa-chart-simple',
}]); }];
if (iAmModerator) {
theTabs.push(
{
key: 'federation',
title: i18n.ts.federation,
icon: 'fas fa-globe',
},
);
}
let headerTabs = $computed(() => theTabs);
definePageMetadata(computed(() => ({ definePageMetadata(computed(() => ({
title: i18n.ts.instanceInfo, title: i18n.ts.instanceInfo,

View file

@ -111,7 +111,27 @@ function focus(): void {
tlComponent.focus(); tlComponent.focus();
} }
const headerActions = $computed(() => []); const headerActions = $computed(() => [{
icon: 'fas fa-list-ul',
title: i18n.ts.lists,
iconOnly: true,
handler: chooseList,
}, {
icon: 'fas fa-satellite',
title: i18n.ts.antennas,
iconOnly: true,
handler: chooseAntenna,
}, {
icon: 'fas fa-satellite-dish',
title: i18n.ts.channel,
iconOnly: true,
handler: chooseChannel,
}, {
icon: 'fas fa-calendar-alt',
title: i18n.ts.jumpToSpecifiedDate,
iconOnly: true,
handler: timetravel,
}]);
const headerTabs = $computed(() => [{ const headerTabs = $computed(() => [{
key: 'home', key: 'home',
@ -133,22 +153,7 @@ const headerTabs = $computed(() => [{
title: i18n.ts._timelines.global, title: i18n.ts._timelines.global,
icon: 'fas fa-globe', icon: 'fas fa-globe',
iconOnly: true, iconOnly: true,
}] : []), /* { }] : [])]);
icon: 'fas fa-list-ul',
title: i18n.ts.lists,
iconOnly: true,
onClick: chooseList,
}, {
icon: 'fas fa-satellite',
title: i18n.ts.antennas,
iconOnly: true,
onClick: chooseAntenna,
}, {
icon: 'fas fa-satellite-dish',
title: i18n.ts.channel,
iconOnly: true,
onClick: chooseChannel,
}*/]);
const headerTabsWhenNotLogin = $computed(() => [ const headerTabsWhenNotLogin = $computed(() => [
...(isLocalTimelineAvailable ? [{ ...(isLocalTimelineAvailable ? [{
@ -172,6 +177,7 @@ definePageMetadata(computed(() => ({
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.cmuxhskf { .cmuxhskf {
> .new { > .new {
position: sticky; position: sticky;