Mercurial > prosody-modules

changeset 1864:991a5f74f848

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mod_candy: Update to work with a stable release instead of git (which no longer works)
author Kim Alvefur <zash@zash.se>
date Sat, 19 Sep 2015 16:51:16 +0200
parents 92602cfac751
children db8b256f51ff
files mod_candy/README.markdown mod_candy/mod_candy.lua mod_candy/www_files/index.html
diffstat 3 files changed, 31 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mod_candy/README.markdown	Fri Sep 18 15:27:53 2015 +0200
+++ b/mod_candy/README.markdown	Sat Sep 19 16:51:16 2015 +0200
@@ -20,7 +20,9 @@
 You then need to download Candy and unpack it into the www\_files
 directory, for example with curl:
 
-    curl -L http://github.com/candy-chat/candy/tarball/master | tar xzfv - --strip-components=1
+    cd www_files
+    curl -OL https://github.com/candy-chat/candy/releases/download/v2.0.0/candy-2.0.0.zip
+    unzip www_files
 
 After the module has been loaded, Candy will by default be reachable
 from `http://example.com:5280/candy/`
--- a/mod_candy/mod_candy.lua	Fri Sep 18 15:27:53 2015 +0200
+++ b/mod_candy/mod_candy.lua	Sat Sep 19 16:51:16 2015 +0200
@@ -1,8 +1,5 @@
 -- mod_candy.lua
 -- Copyright (C) 2013 Kim Alvefur
---
--- Run this in www_files
--- curl -L http://github.com/candy-chat/candy/tarball/master | tar xzfv - --strip-components=1
 
 local json_encode = require"util.json".encode;
 
--- a/mod_candy/www_files/index.html	Fri Sep 18 15:27:53 2015 +0200
+++ b/mod_candy/www_files/index.html	Sat Sep 19 16:51:16 2015 +0200
@@ -6,15 +6,24 @@
 	<link rel="shortcut icon" href="res/img/favicon.png" type="image/gif" />
 	<link rel="stylesheet" type="text/css" href="res/default.css" />
 
-	<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js"></script>
-	<script type="text/javascript" src="libs/libs.min.js"></script>
+	<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+	<script type="text/javascript" src="libs.min.js"></script>
 	<script type="text/javascript" src="candy.min.js"></script>
 	<script type="text/javascript" src="prosody.js"></script><!-- Virtual file generated by mod_candy -->
 	<script type="text/javascript">
 		$(document).ready(function() {
 			Candy.init(Prosody.bosh_path, {
-				core: { debug: false },
-				view: { resources: 'res/' }
+				core: {
+					// only set this to true if developing / debugging errors
+					debug: false,
+					// autojoin is a *required* parameter if you don't have a plugin (e.g. roomPanel) for it
+					//   true
+					//     -> fetch info from server (NOTE: does only work with openfire server)
+					//   ['test@conference.example.com']
+					//     -> array of rooms to join after connecting
+					autojoin: true
+				},
+				view: { assets: 'res/' }
 			});
 
 			if(Prosody.anonymous) {
@@ -22,6 +31,21 @@
 			} else {
 				Candy.Core.connect();
 			}
+
+			/**
+			 * Thanks for trying Candy!
+			 *
+			 * If you need more information, please see here:
+			 *   - Setup instructions & config params: http://candy-chat.github.io/candy/#setup
+			 *   - FAQ & more: https://github.com/candy-chat/candy/wiki
+			 *
+			 * Mailinglist for questions:
+			 *   - http://groups.google.com/group/candy-chat
+			 *
+			 * Github issues for bugs:
+			 *   - https://github.com/candy-chat/candy/issues
+			 */
+
 			document.title += " " + Prosody.version;
 		});
 	</script>