diff --git a/components/Bridge/Bridge.php b/components/Bridge/Bridge.php
index e65157b924..8d7ada332e 100644
--- a/components/Bridge/Bridge.php
+++ b/components/Bridge/Bridge.php
@@ -19,7 +19,7 @@
namespace Component\Bridge;
-use App\Core\Module;
+use App\Core\Modules\Module;
class Bridge extends Module
{
diff --git a/components/Left/Left.php b/components/Left/Left.php
index d1fa80fde8..78c50d2660 100644
--- a/components/Left/Left.php
+++ b/components/Left/Left.php
@@ -21,7 +21,7 @@ namespace Component\Left;
use App\Core\Event;
use App\Core\Log;
-use App\Core\Module;
+use App\Core\Modules\Module;
use App\Util\Common;
use Exception;
diff --git a/components/Media/Media.php b/components/Media/Media.php
index d1938b78e2..1c7c40bdbf 100644
--- a/components/Media/Media.php
+++ b/components/Media/Media.php
@@ -21,7 +21,7 @@ namespace Component\Media;
use App\Core\Cache;
use App\Core\Event;
-use App\Core\Module;
+use App\Core\Modules\Module;
use App\Util\Common;
use App\Util\Nickname;
diff --git a/components/Posting/Posting.php b/components/Posting/Posting.php
index 656334f9ed..6c606f1043 100644
--- a/components/Posting/Posting.php
+++ b/components/Posting/Posting.php
@@ -23,7 +23,7 @@ use App\Core\DB\DB;
use App\Core\Event;
use App\Core\Form;
use function App\Core\I18n\_m;
-use App\Core\Module;
+use App\Core\Modules\Module;
use App\Core\Security;
use App\Entity\FileToNote;
use App\Entity\Note;
diff --git a/config/services.yaml b/config/services.yaml
index b1ac9a1f96..b119a1c83c 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -24,7 +24,7 @@ services:
App\Core\Router\RouteLoader:
tags: ['routing.loader']
- # Wrapper arround Doctrine's StaticPHP metadata driver
+ # Wrapper around Doctrine's StaticPHP metadata driver
app.schemadef_driver:
class: App\DependencyInjection\Compiler\SchemaDefDriver
arguments:
diff --git a/plugins/Cover/Cover.php b/plugins/Cover/Cover.php
index 2158c797c8..20fb6144d4 100644
--- a/plugins/Cover/Cover.php
+++ b/plugins/Cover/Cover.php
@@ -22,7 +22,7 @@ namespace Plugin\Cover;
use App\Core\DB\DB;
use App\Core\Event;
-use App\Core\Module;
+use App\Core\Modules\Module;
use App\Core\Router\RouteLoader;
use App\Util\Common;
diff --git a/plugins/Directory/Directory.php b/plugins/Directory/Directory.php
index a700e0c42b..b565ff1d8a 100644
--- a/plugins/Directory/Directory.php
+++ b/plugins/Directory/Directory.php
@@ -22,7 +22,7 @@
namespace Plugin\Directory;
use App\Core\Event;
-use App\Core\Module;
+use App\Core\Modules\Module;
use App\Core\Router\RouteLoader;
class Directory extends Module
diff --git a/plugins/EmailNotifications/EmailNotifications.php b/plugins/EmailNotifications/EmailNotifications.php
index 5c27296eba..3fb4c70341 100644
--- a/plugins/EmailNotifications/EmailNotifications.php
+++ b/plugins/EmailNotifications/EmailNotifications.php
@@ -33,7 +33,7 @@
namespace Plugin\EmailNotifications;
use App\Core\Event;
-use App\Core\Module;
+use App\Core\Modules\Module;
class EmailNotifications extends Module
{
diff --git a/plugins/Embed/Embed.php b/plugins/Embed/Embed.php
index f6792eb64e..5740c9efc3 100644
--- a/plugins/Embed/Embed.php
+++ b/plugins/Embed/Embed.php
@@ -32,7 +32,7 @@
namespace Plugin\Embed;
-use App\Core\Module;
+use App\Core\Modules\Module;
/**
* Base class for the Embed plugin that does most of the heavy lifting to get
diff --git a/plugins/Favourite/Favourite.php b/plugins/Favourite/Favourite.php
index 1329df1974..4837371786 100644
--- a/plugins/Favourite/Favourite.php
+++ b/plugins/Favourite/Favourite.php
@@ -22,10 +22,10 @@ namespace Plugin\Favourite;
use App\Core\DB\DB;
use App\Core\Event;
use App\Core\Form;
-use App\Core\Module;
-use App\Entity\Favourite as Fave;
+use App\Core\Modules\Module;
use App\Entity\Note;
use App\Util\Common;
+use Plugin\Favourite\Entity\Favourite as Fave;
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\HttpFoundation\Request;
diff --git a/plugins/Media/Media.php b/plugins/Media/Media.php
index f60ff9c5db..ce9385ff2b 100644
--- a/plugins/Media/Media.php
+++ b/plugins/Media/Media.php
@@ -20,7 +20,7 @@
namespace Plugin\Media;
use App\Core\Event;
-use App\Core\Module;
+use App\Core\Modules\Module;
use App\Core\Router\RouteLoader;
class Media extends Module
diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php
index fcf8fb6344..157b92c855 100644
--- a/plugins/Poll/Poll.php
+++ b/plugins/Poll/Poll.php
@@ -24,7 +24,7 @@ use App\Core\DB\DB;
use App\Core\Event;
use App\Core\Form;
use function App\Core\I18n\_m;
-use App\Core\Module;
+use App\Core\Modules\Module;
use App\Core\Router\RouteLoader;
use App\Entity\Note;
use App\Entity\PollResponse;
diff --git a/plugins/ProfileColor/ProfileColor.php b/plugins/ProfileColor/ProfileColor.php
index e7de756a08..ffd4020f2e 100644
--- a/plugins/ProfileColor/ProfileColor.php
+++ b/plugins/ProfileColor/ProfileColor.php
@@ -22,7 +22,7 @@ namespace Plugin\ProfileColor;
use App\Core\DB\DB;
use App\Core\Event;
-use App\Core\Module;
+use App\Core\Modules\Module;
use App\Core\Router\RouteLoader;
use App\Util\Common;
diff --git a/plugins/Repeat/Repeat.php b/plugins/Repeat/Repeat.php
index fe84f23787..a7b9ce6156 100644
--- a/plugins/Repeat/Repeat.php
+++ b/plugins/Repeat/Repeat.php
@@ -22,7 +22,7 @@ namespace Plugin\Repeat;
use App\Core\DB\DB;
use App\Core\Event;
use App\Core\Form;
-use App\Core\Module;
+use App\Core\Modules\Module;
use App\Entity\Note;
use App\Util\Common;
use App\Util\Exception\NotFoundException;
diff --git a/plugins/Reply/Reply.php b/plugins/Reply/Reply.php
index 9657790e62..259a37d93b 100644
--- a/plugins/Reply/Reply.php
+++ b/plugins/Reply/Reply.php
@@ -25,7 +25,7 @@ use App\Core\DB\DB;
use App\Core\Event;
use App\Core\Form;
use function App\Core\I18n\_m;
-use App\Core\Module;
+use App\Core\Modules\Module;
use App\Entity\Note;
use App\Util\Common;
use App\Util\Exceptiion\InvalidFormException;
diff --git a/plugins/StoreRemoteMedia/StoreRemoteMedia.php b/plugins/StoreRemoteMedia/StoreRemoteMedia.php
index 4af322d92a..17165d458a 100644
--- a/plugins/StoreRemoteMedia/StoreRemoteMedia.php
+++ b/plugins/StoreRemoteMedia/StoreRemoteMedia.php
@@ -16,7 +16,7 @@
namespace Plugin\StoreRemoteMedia;
-use App\Core\Module;
+use App\Core\Modules\Module;
/**
* The StoreRemoteMedia plugin downloads remotely attached files to local server.
diff --git a/plugins/TreeNotes/TreeNotes.php b/plugins/TreeNotes/TreeNotes.php
index 99c9ea5805..8cbf561949 100644
--- a/plugins/TreeNotes/TreeNotes.php
+++ b/plugins/TreeNotes/TreeNotes.php
@@ -19,10 +19,8 @@
namespace Plugin\TreeNotes;
+use App\Core\Modules\Module;
use App\Entity\Note;
-use App\Core\Event;
-use App\Core\Module;
-use Functional as F;
class TreeNotes extends Module
{
@@ -31,7 +29,7 @@ class TreeNotes extends Module
*/
public function onFormatNoteList(array &$notes_in_trees_out)
{
- $roots = array_filter($notes_in_trees_out, function(Note $note) { return $note->getReplyTo() == null; }, ARRAY_FILTER_USE_BOTH);
+ $roots = array_filter($notes_in_trees_out, function (Note $note) { return $note->getReplyTo() == null; }, ARRAY_FILTER_USE_BOTH);
$notes_in_trees_out = $this->build_tree($roots, $notes_in_trees_out);
}
@@ -46,7 +44,7 @@ class TreeNotes extends Module
private function build_subtree(Note $parent, array $notes)
{
- $children = array_filter($notes, function(Note $n) use ($parent) { return $parent->getId() == $n->getReplyTo(); }, ARRAY_FILTER_USE_BOTH);
+ $children = array_filter($notes, function (Note $n) use ($parent) { return $parent->getId() == $n->getReplyTo(); }, ARRAY_FILTER_USE_BOTH);
return ['note' => $parent, 'replies' => $this->build_tree($children, $notes)];
}
}
diff --git a/plugins/FFmpeg/FFmpeg.php b/plugins/VideoThumbnail/FFmpeg.php
similarity index 99%
rename from plugins/FFmpeg/FFmpeg.php
rename to plugins/VideoThumbnail/FFmpeg.php
index 7973a1de54..5a521b12d1 100644
--- a/plugins/FFmpeg/FFmpeg.php
+++ b/plugins/VideoThumbnail/FFmpeg.php
@@ -28,7 +28,7 @@
namespace Plugin\FFmpeg;
-use App\Core\Module;
+use App\Core\Modules\Module;
use Plugin\Media\Util\ImageFile;
class FFmpeg extends Module
diff --git a/plugins/FFmpeg/README.md b/plugins/VideoThumbnail/README.md
similarity index 100%
rename from plugins/FFmpeg/README.md
rename to plugins/VideoThumbnail/README.md
diff --git a/plugins/FFmpeg/locale/FFmpeg.pot b/plugins/VideoThumbnail/locale/FFmpeg.pot
similarity index 100%
rename from plugins/FFmpeg/locale/FFmpeg.pot
rename to plugins/VideoThumbnail/locale/FFmpeg.pot
diff --git a/plugins/FFmpeg/locale/en_GB/LC_MESSAGES/FFmpeg.po b/plugins/VideoThumbnail/locale/en_GB/LC_MESSAGES/FFmpeg.po
similarity index 100%
rename from plugins/FFmpeg/locale/en_GB/LC_MESSAGES/FFmpeg.po
rename to plugins/VideoThumbnail/locale/en_GB/LC_MESSAGES/FFmpeg.po
diff --git a/plugins/FFmpeg/locale/pt/LC_MESSAGES/FFmpeg.po b/plugins/VideoThumbnail/locale/pt/LC_MESSAGES/FFmpeg.po
similarity index 100%
rename from plugins/FFmpeg/locale/pt/LC_MESSAGES/FFmpeg.po
rename to plugins/VideoThumbnail/locale/pt/LC_MESSAGES/FFmpeg.po
diff --git a/plugins/XMPPNotifications/XMPPNotifications.php b/plugins/XMPPNotifications/XMPPNotifications.php
index eef98891c9..6c6f0d7237 100644
--- a/plugins/XMPPNotifications/XMPPNotifications.php
+++ b/plugins/XMPPNotifications/XMPPNotifications.php
@@ -33,7 +33,7 @@
namespace Plugin\XMPPNotifications;
use App\Core\Event;
-use App\Core\Module;
+use App\Core\Modules\Module;
class XMPPNotifications extends Module
{
diff --git a/src/Core/Module.php b/src/Core/Modules/Module.php
similarity index 99%
rename from src/Core/Module.php
rename to src/Core/Modules/Module.php
index 1d829b77a5..aac565c4c9 100644
--- a/src/Core/Module.php
+++ b/src/Core/Modules/Module.php
@@ -17,7 +17,7 @@
// along with GNU social. If not, see