Merge tag '1.14.1' into develop
1.14.1
This commit is contained in:
commit
cc8ffc946e
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "mnml-client",
|
||||
"version": "1.14.0",
|
||||
"version": "1.14.1",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "mnml-client",
|
||||
"version": "1.14.0",
|
||||
"version": "1.14.1",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
||||
@ -166,9 +166,12 @@ function registerEvents(store) {
|
||||
function setInvite(code) {
|
||||
if (!code) return store.dispatch(actions.setInvite(null));
|
||||
const link = `${document.location.origin}#join=${code}`;
|
||||
navigator.clipboard.writeText(link).then(() => {
|
||||
notify('Invite link copied to clipboard.');
|
||||
}, () => {});
|
||||
|
||||
if (navigator.clipboard) {
|
||||
navigator.clipboard.writeText(link).then(() => {
|
||||
notify('Invite link copied to clipboard.');
|
||||
}, () => {});
|
||||
}
|
||||
|
||||
return store.dispatch(actions.setInvite(code));
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "mnml_core"
|
||||
version = "1.14.0"
|
||||
version = "1.14.1"
|
||||
authors = ["ntr <ntr@smokestack.io>", "mashy <mashy@mnml.gg>"]
|
||||
|
||||
[dependencies]
|
||||
|
||||
@ -804,7 +804,7 @@ impl Game {
|
||||
}
|
||||
}
|
||||
|
||||
fn finish(mut self) -> Game {
|
||||
pub fn finish(mut self) -> Game {
|
||||
self.phase = Phase::Finished;
|
||||
// self.log.push(format!("Game finished."));
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "mnml-ops",
|
||||
"version": "1.14.0",
|
||||
"version": "1.14.1",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "mnml"
|
||||
version = "1.14.0"
|
||||
version = "1.14.1"
|
||||
authors = ["ntr <ntr@smokestack.io>"]
|
||||
|
||||
[dependencies]
|
||||
|
||||
@ -13,6 +13,7 @@ use pg::{
|
||||
PgPool,
|
||||
|
||||
games_need_upkeep,
|
||||
game_get,
|
||||
game_update,
|
||||
game_write,
|
||||
game_delete,
|
||||
@ -157,6 +158,12 @@ fn fetch_instances(mut tx: Transaction) -> Result<Transaction, Error> {
|
||||
}
|
||||
|
||||
for mut instance in instances_idle(&mut tx)? {
|
||||
if let Some(game_id) = instance.current_game_id() {
|
||||
let mut game = game_get(&mut tx, game_id)?;
|
||||
game = game.finish();
|
||||
game_update(&mut tx, &game)?;
|
||||
}
|
||||
|
||||
instance.finish();
|
||||
instance_update(&mut tx, instance)?;
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "mnml-studios",
|
||||
"version": "1.14.0",
|
||||
"version": "1.14.1",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user