Skip to content

Commit

Permalink
Merge branch 'main' into disable-buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
munierujp authored Jul 16, 2023
2 parents 7d05fec + dbe161b commit 78e4e05
Show file tree
Hide file tree
Showing 7 changed files with 1,701 additions and 1,284 deletions.
7 changes: 1 addition & 6 deletions components/AppHelpButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ const closeDialog = () => {
<h3>Twilogの検索結果を開く</h3>
<p>Twilogの検索結果を開くには、「Twilog(検索)」ボタンをクリック(タップ)します。</p>
<h3>Twilogの日別ページを開く</h3>
<p>
Twilogの日別ページを開くには、「Twilog(日別)」ボタンをクリック(タップ)します。なお、<a
href="https://twitter.com/ropross/status/1643572802224783361"
target="_blank"
>Twilogは2023年4月5日以降ツイートの取得を停止しています。</a>
</p>
<p>Twilogの日別ページを開くには、「Twilog(日別)」ボタンをクリック(タップ)します。</p>
<h3>ツイセーブの検索結果を開く</h3>
<p>ツイセーブの検索結果を開くには、「ツイセーブ(検索)」ボタンをクリック(タップ)します。</p>
<h3>ツイセーブの日別ページを開く</h3>
Expand Down
2,930 changes: 1,676 additions & 1,254 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "anohi-no-tweet",
"version": "1.3.1",
"version": "1.4.0",
"description": "指定した条件にマッチするツイートの検索結果、Twilog、ツイセーブなどを開くためのウェブアプリ",
"private": true,
"scripts": {
Expand All @@ -16,26 +16,26 @@
},
"devDependencies": {
"@element-plus/nuxt": "1.0.5",
"@markuplint/vue-parser": "3.7.0",
"@markuplint/vue-spec": "3.8.0",
"@markuplint/vue-parser": "3.9.0",
"@markuplint/vue-spec": "3.10.0",
"@mdi/font": "7.2.96",
"@munierujp/eslint-config-typescript": "24.0.0",
"@munierujp/eslint-config-typescript": "27.0.0",
"@nuxt/eslint-config": "0.1.1",
"@nuxt/test-utils": "3.4.3",
"@nuxt/test-utils": "3.6.3",
"@nuxtjs/eslint-module": "4.1.0",
"@pinia-plugin-persistedstate/nuxt": "1.1.1",
"@pinia/nuxt": "0.4.11",
"@types/node": "18.14.6",
"@vite-pwa/nuxt": "0.0.8",
"@vite-pwa/nuxt": "0.1.0",
"date-fns": "2.30.0",
"eslint": "8.40.0",
"markuplint": "3.10.0",
"npm-run-all2": "6.0.5",
"eslint": "8.45.0",
"markuplint": "3.12.0",
"npm-run-all2": "6.0.6",
"nuxt": "3.4.3",
"nuxt-icon": "0.4.0",
"nuxt-icon": "0.4.2",
"pinia": "2.0.35",
"pinia-plugin-persistedstate-2": "2.0.14",
"sass": "1.62.1",
"vitest": "0.30.1"
"sass": "1.63.6",
"vitest": "0.32.4"
}
}
6 changes: 3 additions & 3 deletions utils/createTwilogDateURL.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ describe('createTwilogDateURL', () => {
{
user: '',
date: new Date(''),
expected: 'https://twilog.org/'
expected: 'https://twilog.togetter.com/'
},
{
user: 'munieru_jp',
date: new Date(''),
expected: 'https://twilog.org/munieru_jp/'
expected: 'https://twilog.togetter.com/munieru_jp/'
},
{
user: 'munieru_jp',
date: new Date('2023-04-13'),
expected: 'https://twilog.org/munieru_jp/date-230413'
expected: 'https://twilog.togetter.com/munieru_jp/date-230413'
}
])('user=$user, date=$date', ({
user,
Expand Down
6 changes: 3 additions & 3 deletions utils/createTwilogDateURL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ export const createTwilogDateURL = ({
date: Date
}): string => {
if (user === '') {
return 'https://twilog.org/'
return 'https://twilog.togetter.com/'
}

if (!isValid(date)) {
return `https://twilog.org/${user}/`
return `https://twilog.togetter.com/${user}/`
}

const dateString = format(date, 'yyMMdd')
return `https://twilog.org/${user}/date-${dateString}`
return `https://twilog.togetter.com/${user}/date-${dateString}`
}
6 changes: 3 additions & 3 deletions utils/createTwilogKeywordSearchURL.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ describe('createTwilogKeywordSearchURL', () => {
{
user: '',
keyword: '',
expected: 'https://twilog.org/'
expected: 'https://twilog.togetter.com/'
},
{
user: 'munieru_jp',
keyword: '',
expected: 'https://twilog.org/munieru_jp/'
expected: 'https://twilog.togetter.com/munieru_jp/'
},
{
user: 'munieru_jp',
keyword: 'hello',
expected: 'https://twilog.org/munieru_jp/search?word=hello'
expected: 'https://twilog.togetter.com/munieru_jp/search?word=hello'
}
])('user=$user, keyword=$keyword', ({
user,
Expand Down
6 changes: 3 additions & 3 deletions utils/createTwilogKeywordSearchURL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ export const createTwilogKeywordSearchURL = ({
keyword: string
}): string => {
if (user === '') {
return 'https://twilog.org/'
return 'https://twilog.togetter.com/'
}

if (keyword === '') {
return `https://twilog.org/${user}/`
return `https://twilog.togetter.com/${user}/`
}

return `https://twilog.org/${user}/search?word=${keyword}`
return `https://twilog.togetter.com/${user}/search?word=${keyword}`
}

0 comments on commit 78e4e05

Please sign in to comment.