Merge branch 'master' into feature/laravel-tests

Author: itinerare

.gitignore

@@ -11,4 +11,4 @@ npm-debug.log
 yarn-error.log
 /composer.lock
 *.env
-/.idea
+/composer.phar

CONTRIBUTING.md

@@ -0,0 +1,33 @@
+# Lorekeeper Contribution Guide
+
+For support and general questions and discussions, please visit the [support Discord server](https://discord.gg/U4JZfsu)! Please do not use the issue tracker for general support questions. Please also remember that unless explicitly stated otherwise/you have hired services to that end, all support is free and offered on a volunteer basis, and there is no guarantee or obligation upon maintainers and/or community members to provide support.
+
+The following are accepted uses for the [issue tracker](https://github.com/corowne/Lorekeeper/issues):
+- Bug reports
+- Feature or enhancement requests (within reason)-- note that these may be denied if they are deemed out of scope of the project and/or are not feasible to implement for any reason.
+
+## Opening an Issue
+### Reporting a bug
+
+File bugs in the [issue tracker](https://github.com/corowne/Lorekeeper/issues). Please follow these guidelines:
+
+- Search existing issues first! Make sure your issue hasn't already been reported.
+- Stay on topic, but describe the issue in detail so that others can reproduce it.
+- Don't use one issue for multiple bugs! Keeping them 1:1 helps with tracking and fixing problems. Similarly, don't make multiple issues for one bug.
+- Provide screenshot(s) if possible.
+
+### Feature requests
+
+It's recommended to discuss potential new features in the [support Discord](https://discord.gg/U4JZfsu) before creating an issue, as this helps check that it is valid for a feature request and if it would be useful to others-- something which increases its likelihood of being implemented. Please also check that your request has not already been posted on the [issue tracker](https://github.com/corowne/Lorekeeper/issues).
+
+Avoid listing multiple requests in one issue. One issue per request makes it easier to track and discuss it. If need be, you may make multiple issues (within reason), but do not spam. Do not make multiple issues for the same request.
+
+## Contributing Code
+
+Please see the full [Contribution Guide](http://wiki.lorekeeper.me/index.php?title=Contributing_to_Lorekeeper) for more information!
+
+### About abandoned pull requests
+
+In the case where a pull request is started but not finished and the contributor is nonresponsive despite efforts to contact them, the pull request will be closed regardless of its status. It is up to contributors to finish work, make any requested changes, etc., not maintainers.
+
+However, knowledge from the issue and/or pull request may be used to create a new pull request, potentially based on the changes from the closed pull request.

README.md

@@ -2,8 +2,8 @@
 
 Lorekeeper is a framework for managing deviantART-based ARPGs/closed species masterlists coded using the Laravel framework. In simple terms - you will be able to make a copy of the site, do some minor setup/enter data about your species and game, and it'll provide you with the automation to keep track of your species, players and ARPG submissions.
 
-Demo site: [http://lorekeeper.me/](http://lorekeeper.me/)
-Wiki for users: [http://lorekeeper-arpg.wikidot.com/](http://lorekeeper-arpg.wikidot.com/)
+- Demo site: [http://lorekeeper.me/](http://lorekeeper.me/)
+- Wiki: [http://wiki.lorekeeper.me](http://wiki.lorekeeper.me/index.php?title=Main_Page)
 
 # Features
 
@@ -19,11 +19,11 @@ Wiki for users: [http://lorekeeper-arpg.wikidot.com/](http://lorekeeper-arpg.wik
 - Speaking of which, you can search for characters based on traits, rarity, etc. Also, trait/item/etc. data get their own searchable lists - no need to create additional pages detailing restrictions on how a trait should be drawn/described.
 - Unless you want to, in which case you can add custom pages in HTML without touching the codebase!
 - A raffle roller for consecutive raffles! Mods can add/remove tickets and users who have already won something will be automatically removed from future raffles in the sequence.
-- ...and more! Please refer to the [Wiki](http://lorekeeper-arpg.wikidot.com/) for more information and instructions for usage.
+- ...and more! Please refer to the [Wiki](http://wiki.lorekeeper.me/index.php?title=Category:Documentation) for more information and instructions for usage.
 
 # Setup
 
-Important: For those who are not familiar with web dev, please refer to the [Wiki](http://lorekeeper-arpg.wikidot.com/) for a much more detailed set of instructions!!
+Important: For those who are not familiar with web dev, please refer to the [Wiki](http://wiki.lorekeeper.me/index.php?title=Tutorial:_Setting_Up) for a much more detailed set of instructions!!
 
 ## Obtain a copy of the code
 
@@ -37,16 +37,12 @@ $ git clone https://github.com/corowne/lorekeeper.git
 $ cp .env.example .env
 ```
 
-deviantART client ID and secret are required for this step.
-While obtaining the ID and secret, also add whitelist entries for redirection for your site URL (if being hosted) or localhost (if working locally).
+Client ID and secret for at least one supported social media platform are required for this step. See [the Wiki](http://wiki.lorekeeper.me/index.php?title=Category:Social_Media_Authentication) for platform-specific instructions.
+
 Add the following to .env, filling them in as required (also fill in the rest of .env where relevant):
 ```
 CONTACT_ADDRESS=(contact email address)
 DEVIANTART_ACCOUNT=(username of ARPG group account)
-
-DEVIANTART_CLIENT_ID=(client ID as supplied by deviantART)
-DEVIANTART_CLIENT_SECRET=(client secret as supplied by deviantART)
-DEVIANTART_CALLBACK_URL=/
 ```
 
 ## Setting up
@@ -74,8 +70,8 @@ Finally, set up the admin account for logging in:
 $ php artisan setup-admin-user
 ```
 
-You will need to send yourself the verification email and then link your dA account as prompted.
+You will need to send yourself the verification email and then link your social media account as prompted.
 
 ## Contact
 
-If you have any questions, please feel free to contact me through email: corowne@gmail.com
+If you have any questions, please feel free to contact me through email: corowne@gmail.com

app/Console/Commands/AddSiteSettings.php

@@ -32,6 +32,30 @@ public function __construct()
         parent::__construct();
     }
 
+    /**
+     * Add a site setting.
+     * 
+     * Example usage:
+     * $this->addSiteSetting("site_setting_key", 1, "0: does nothing. 1: does something.");
+     * 
+     * @param  string  $key
+     * @param  int     $value
+     * @param  string  $description
+     */
+    private function addSiteSetting($key, $value, $description) {
+        if(!DB::table('site_settings')->where('key', $key)->exists()) {
+            DB::table('site_settings')->insert([
+                [
+                    'key'         => $key,
+                    'value'       => $value,
+                    'description' => $description,
+                ],
+            ]);
+            $this->info( "Added:   ".$key." / Default: ".$value);
+        }
+        else $this->line("Skipped: ".$key);
+    }
+
     /**
      * Execute the console command.
      *
@@ -45,137 +69,41 @@ public function handle()
 
         $this->line("Adding site settings...existing entries will be skipped.\n");
 
-        if(!DB::table('site_settings')->where('key', 'is_registration_open')->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key' => 'is_registration_open',
-                    'value' => 1,
-                    'description' => '0: Registration closed, 1: Registration open. When registration is closed, invitation keys can still be used to register.'
-                ]
+        $this->addSiteSetting('is_registration_open', 1, '0: Registration closed, 1: Registration open. When registration is closed, invitation keys can still be used to register.');
 
-            ]);
-            $this->info("Added:   is_registration_open / Default: 1");
-        }
-        else $this->line("Skipped: is_registration_open");
-        
-        if(!DB::table('site_settings')->where('key', 'transfer_cooldown')->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key' => 'transfer_cooldown',
-                    'value' => 0,
-                    'description' => 'Number of days to add to the cooldown timer when a character is transferred.'
-                ]
+        $this->addSiteSetting('transfer_cooldown', 0, 'Number of days to add to the cooldown timer when a character is transferred.');
 
-            ]);
-            $this->info("Added:   transfer_cooldown / Default: 0");
-        }
-        else $this->line("Skipped: transfer_cooldown");
-        
-        if(!DB::table('site_settings')->where('key', 'open_transfers_queue')->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key' => 'open_transfers_queue',
-                    'value' => 0,
-                    'description' => '0: Character transfers do not need mod approval, 1: Transfers must be approved by a mod.'
-                ]
+        $this->addSiteSetting('open_transfers_queue', 0, '0: Character transfers do not need mod approval, 1: Transfers must be approved by a mod.');
 
-            ]);
-            $this->info("Added:   open_transfers_queue / Default: 0");
-        }
-        else $this->line("Skipped: open_transfers_queue");
-        
-        if(!DB::table('site_settings')->where('key', 'is_prompts_open')->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key' => 'is_prompts_open',
-                    'value' => 1,
-                    'description' => '0: New prompt submissions cannot be made (mods can work on the queue still), 1: Prompts are submittable.'
-                ]
+        $this->addSiteSetting('is_prompts_open', 1, '0: New prompt submissions cannot be made (mods can work on the queue still), 1: Prompts are submittable.');
 
-            ]);
-            $this->info("Added:   is_prompts_open / Default: 1");
-        }
-        else $this->line("Skipped: is_prompts_open");
-        
-        if(!DB::table('site_settings')->where('key', 'is_claims_open')->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key' => 'is_claims_open',
-                    'value' => 1,
-                    'description' => '0: New claims cannot be made (mods can work on the queue still), 1: Claims are submittable.'
-                ]
+        $this->addSiteSetting('is_claims_open', 1, '0: New claims cannot be made (mods can work on the queue still), 1: Claims are submittable.');
 
-            ]);
-            $this->info("Added:   is_claims_open / Default: 1");
-        }
-        else $this->line("Skipped: is_claims_open");
-        
-        if(!DB::table('site_settings')->where('key', 'is_myos_open')->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key' => 'is_myos_open',
-                    'value' => 1,
-                    'description' => '0: MYO slots cannot be submitted for design approval, 1: MYO slots can be submitted for approval.'
-                ]
+        $this->addSiteSetting('is_reports_open', 1, '0: New reports cannot be made (mods can work on the queue still), 1: Reports are submittable.');
 
-            ]);
-            $this->info("Added:   is_myos_open / Default: 1");
-        }
-        else $this->line("Skipped: is_myos_open");
-        
-        if(!DB::table('site_settings')->where('key', 'is_design_updates_open')->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key' => 'is_design_updates_open',
-                    'value' => 1,
-                    'description' => '0: Characters cannot be submitted for design update approval, 1: Characters can be submitted for design update approval.'
-                ]
+        $this->addSiteSetting('is_myos_open', 1, '0: MYO slots cannot be submitted for design approval, 1: MYO slots can be submitted for approval.');
 
-            ]);
-            $this->info("Added:   is_design_updates_open / Default: 1");
-        }
-        else $this->line("Skipped: is_design_updates_open");
-        
-        if(!DB::table('site_settings')->where('key', 'blacklist_privacy')->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key' => 'blacklist_privacy',
-                    'value' => 0,
-                    'description' => 'Who can view the blacklist? 0: Admin only, 1: Staff only, 2: Members only, 3: Public.'
-                ]
+        $this->addSiteSetting('is_design_updates_open', 1, '0: Characters cannot be submitted for design update approval, 1: Characters can be submitted for design update approval.');
 
-            ]);
-            $this->info("Added:   blacklist_privacy / Default: 0");
-        }
-        else $this->line("Skipped: blacklist_privacy");
-        
-        if(!DB::table('site_settings')->where('key', 'blacklist_link')->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key' => 'blacklist_link',
-                    'value' => 0,
-                    'description' => '0: No link to the blacklist is displayed anywhere, 1: Link to the blacklist is shown on the user list.'
-                ]
+        $this->addSiteSetting('blacklist_privacy', 0, 'Who can view the blacklist? 0: Admin only, 1: Staff only, 2: Members only, 3: Public.');
 
-            ]);
-            $this->info("Added:   blacklist_link / Default: 0");
-        }
-        else $this->line("Skipped: blacklist_link");
-        
-        if(!DB::table('site_settings')->where('key', 'blacklist_key')->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key' => 'blacklist_key',
-                    'value' => 0,
-                    'description' => 'Optional key to view the blacklist. Enter "0" to not require one.'
-                ]
+        $this->addSiteSetting('blacklist_link', 0, '0: No link to the blacklist is displayed anywhere, 1: Link to the blacklist is shown on the user list.');
 
-            ]);
-            $this->info("Added:   blacklist_key / Default: 0");
-        }
-        else $this->line("Skipped: blacklist_key");
+        $this->addSiteSetting('blacklist_key', 0, 'Optional key to view the blacklist. Enter "0" to not require one.');
+
+        $this->addSiteSetting('design_votes_needed', 3, 'Number of approval votes needed for a design update or MYO submission to be considered as having approval.');
+
+        $this->addSiteSetting('admin_user', 1, 'ID of the site\'s admin user.');
+
+        $this->addSiteSetting('gallery_submissions_open', 1, '0: Gallery submissions closed, 1: Gallery submissions open.');
+
+        $this->addSiteSetting('gallery_submissions_require_approval', 1, '0: Gallery submissions do not require approval, 1: Gallery submissions require approval.');
+
+        $this->addSiteSetting('gallery_submissions_reward_currency', 0, '0: Gallery submissions do not reward currency, 1: Gallery submissions reward currency.');
+
+        $this->addSiteSetting('group_currency', 1, 'ID of the group currency to award from gallery submissions (if enabled).');
 
         $this->line("\nSite settings up to date!");
-        
+
     }
 }

app/Console/Commands/AssignArtCreditsToIds.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Services\SalesService;
+
+class CheckSales extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'check-sales';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Checks if there are any sales posts to update.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //
+        (new SalesService)->updateQueue();
+    }
+}