Skip to content

Commit ae1575c

Browse files
committed
feat: kirby 5 compatibility
1 parent 443b82b commit ae1575c

File tree

8 files changed

+63
-62
lines changed

8 files changed

+63
-62
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@
6262
"npm run build"
6363
]
6464
}
65-
}
65+
}

composer.lock

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Sender.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private function parseLayoutFields($content)
116116
public function getPostTargetUrl($target, $page)
117117
{
118118

119-
if($page->mastodonStatusUrl()->isNotEmpty()) {
119+
if ($page->mastodonStatusUrl()->isNotEmpty()) {
120120
return $page->mastodonStatusUrl()->value();
121121
}
122122

@@ -225,7 +225,7 @@ public function readOutbox($page): array
225225
}
226226

227227
// fix for outbox format mismatch
228-
if(count($outbox['webmentions']) > 0 && !isset($outbox['webmentions'][0]['url'])) {
228+
if (count($outbox['webmentions']) > 0 && !isset($outbox['webmentions'][0]['url'])) {
229229
$outbox['webmentions'] = $this->convertProcessedUrlsToV2($outbox['webmentions']);
230230
}
231231

lib/WebmentionSender.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ public function sendWebmentions($page)
6969
'status' => $status,
7070
'retries' => 0,
7171
];
72-
7372
}
7473

7574
$mergedUrls = $this->mergeUrlsWithOutbox($processedUrls, $page);
75+
7676
$this->updateWebmentions($mergedUrls, $page);
7777

7878
if (option('mauricerenck.indieConnector.stats.enabled', false)) {
@@ -183,12 +183,12 @@ public function mergeUrlsWithOutbox($newEntries, $page)
183183

184184
$existingEntry =
185185
count($existingEntries) === 0
186-
? $newEntry
187-
: array_shift($existingEntries);
186+
? $newEntry
187+
: array_shift($existingEntries);
188188

189189
$mergedEntry = array_merge($existingEntry, $newEntry);
190190

191-
if($mergedEntry['status'] === 'error') {
191+
if ($mergedEntry['status'] === 'error') {
192192
$mergedEntry['retries'] = $existingEntry['retries'] + 1;
193193
}
194194

src/components/Queue.vue

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
11
<template>
2-
<k-inside>
2+
<k-panel-inside>
33
<div class="k-webmentions-queue-view">
44
<k-header>IndieConnector</k-header>
55
<k-tabs
6-
tab="queue"
7-
:tabs="[
8-
{ name: 'webmentions', label: 'Webmentions', link: '/webmentions' },
9-
{ name: 'queue', label: 'Queue', link: '/webmentions/queue', badge: itemsInQueue }
10-
]"
11-
theme='warning'
12-
6+
tab="queue"
7+
:tabs="[
8+
{ name: 'webmentions', label: 'Webmentions', link: '/webmentions' },
9+
{ name: 'queue', label: 'Queue', link: '/webmentions/queue', badge: itemsInQueue },
10+
]"
11+
theme="warning"
1312
/>
1413

15-
<k-info-field v-if="disabled" label="Queue disabled" text="The queue feature is disabled. Configure it in your config.php" />
14+
<k-info-field
15+
v-if="disabled"
16+
label="Queue disabled"
17+
text="The queue feature is disabled. Configure it in your config.php"
18+
/>
1619

1720
<QueueList :queuedItems="queuedItems" />
1821
</div>
19-
</k-inside>
22+
</k-panel-inside>
2023
</template>
2124

2225
<script>
2326
export default {
2427
props: {
25-
disabled: Boolean,
26-
queuedItems: Object,
27-
itemsInQueue: Number
28+
disabled: Boolean,
29+
queuedItems: Object,
30+
itemsInQueue: Number,
2831
},
2932
30-
methods: {
31-
32-
},
33+
methods: {},
3334
}
3435
</script>
3536

src/components/View.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<template>
2-
<k-inside>
2+
<k-panel-inside>
33
<div class="k-webmentions-view">
44
<k-header>IndieConnector</k-header>
55
<k-tabs
6-
tab="webmentions"
7-
:tabs="[
8-
{ name: 'webmentions', label: 'Webmentions', link: '/webmentions' },
9-
{ name: 'queue', label: 'Queue', link: '/webmentions/queue', badge: itemsInQueue}
10-
]"
11-
theme='warning'
6+
tab="webmentions"
7+
:tabs="[
8+
{ name: 'webmentions', label: 'Webmentions', link: '/webmentions' },
9+
{ name: 'queue', label: 'Queue', link: '/webmentions/queue', badge: itemsInQueue },
10+
]"
11+
theme="warning"
1212
/>
1313

1414
<div class="prev-next">
@@ -25,7 +25,7 @@
2525
<Targets :targets="targets" />
2626
</k-grid>
2727
</div>
28-
</k-inside>
28+
</k-panel-inside>
2929
</template>
3030

3131
<script>

vendor/composer/installed.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php return array(
22
'root' => array(
33
'name' => 'mauricerenck/indieconnector',
4-
'pretty_version' => '2.3.3',
5-
'version' => '2.3.3.0',
4+
'pretty_version' => '2.4.0',
5+
'version' => '2.4.0.0',
66
'reference' => NULL,
77
'type' => 'kirby-plugin',
88
'install_path' => __DIR__ . '/../../',
@@ -38,8 +38,8 @@
3838
'dev_requirement' => false,
3939
),
4040
'mauricerenck/indieconnector' => array(
41-
'pretty_version' => '2.3.3',
42-
'version' => '2.3.3.0',
41+
'pretty_version' => '2.4.0',
42+
'version' => '2.4.0.0',
4343
'reference' => NULL,
4444
'type' => 'kirby-plugin',
4545
'install_path' => __DIR__ . '/../../',

0 commit comments

Comments
 (0)