0.5: change entire API to use futures & hyper's async branch

Cargo.toml

@@ -1,19 +1,21 @@
 [package]
-name = "glitch-in-the-matrix"
+authors = ["eeeeeta <[email protected]>"]
 description = "A set of matrix.org bindings for Rust."
 documentation = "http://docs.rs/glitch-in-the-matrix"
 homepage = "https://github.com/eeeeeta/glitch-in-the-matrix"
-repository = "https://github.com/eeeeeta/glitch-in-the-matrix"
-readme = "README.md"
 keywords = ["chat", "matrix"]
-license = "Unlicense"
-version = "0.4.0"
-authors = ["eeeeeta <[email protected]>"]
+license = "CC0-1.0"
+name = "glitch-in-the-matrix"
+readme = "README.md"
+repository = "https://github.com/eeeeeta/glitch-in-the-matrix"
+version = "0.5.0"
 
 [dependencies]
+error-chain = "0.10"
+futures = "0.1.14"
+hyper = "0.11"
+hyper-openssl = "0.3"
 serde = "0.9"
 serde_derive = "0.9"
 serde_json = "0.9"
-hyper = "0.10"
-error-chain = "0.10"
-hyper-native-tls = "0.2"
+tokio-core = "0.1"

LICENSE

@@ -0,0 +1,123 @@
+Creative Commons Legal Code
+CC0 1.0 Universal
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE
+INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES
+RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+HEREUNDER. 
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator and
+subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
+purpose of contributing to a commons of creative, cultural and scientific works
+("Commons") that the public can reliably and without fear of later claims of
+infringement build upon, modify, incorporate in other works, reuse and
+redistribute as freely as possible in any form whatsoever and for any purposes,
+including without limitation commercial purposes. These owners may contribute
+to the Commons to promote the ideal of a free culture and the further
+production of creative, cultural and scientific works, or to gain reputation or
+greater distribution for their Work in part through the use and efforts of
+others.
+
+For these and/or other purposes and motivations, and without any expectation of
+additional consideration or compensation, the person associating CC0 with a
+Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
+and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and
+publicly distribute the Work under its terms, with knowledge of his or her
+Copyright and Related Rights in the Work and the meaning and intended legal
+effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not limited to,
+the following:
+
+    1. the right to reproduce, adapt, distribute, perform, display,
+    communicate, and translate a Work;
+
+    2. moral rights retained by the original author(s) and/or performer(s);
+
+    3. publicity and privacy rights pertaining to a person's image or likeness
+    depicted in a Work;
+
+    4. rights protecting against unfair competition in regards to a Work,
+    subject to the limitations in paragraph 4(a), below;
+
+    5. rights protecting the extraction, dissemination, use and reuse of data
+    in a Work;
+
+    6. database rights (such as those arising under Directive 96/9/EC of the
+    European Parliament and of the Council of 11 March 1996 on the legal
+    protection of databases, and under any national implementation thereof,
+    including any amended or successor version of such directive); and
+
+    7. other similar, equivalent or corresponding rights throughout the world
+    based on applicable law or treaty, and any national implementations
+    thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
+applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
+and Related Rights and associated claims and causes of action, whether now
+known or unknown (including existing as well as future claims and causes of
+action), in the Work (i) in all territories worldwide, (ii) for the maximum
+duration provided by applicable law or treaty (including future time
+extensions), (iii) in any current or future medium and for any number of
+copies, and (iv) for any purpose whatsoever, including without limitation
+commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
+the Waiver for the benefit of each member of the public at large and to the
+detriment of Affirmer's heirs and successors, fully intending that such Waiver
+shall not be subject to revocation, rescission, cancellation, termination, or
+any other legal or equitable action to disrupt the quiet enjoyment of the Work
+by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be
+judged legally invalid or ineffective under applicable law, then the Waiver
+shall be preserved to the maximum extent permitted taking into account
+Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
+is so judged Affirmer hereby grants to each affected person a royalty-free, non
+transferable, non sublicensable, non exclusive, irrevocable and unconditional
+license to exercise Affirmer's Copyright and Related Rights in the Work (i) in
+all territories worldwide, (ii) for the maximum duration provided by applicable
+law or treaty (including future time extensions), (iii) in any current or
+future medium and for any number of copies, and (iv) for any purpose
+whatsoever, including without limitation commercial, advertising or promotional
+purposes (the "License"). The License shall be deemed effective as of the date
+CC0 was applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder of the
+License, and in such case Affirmer hereby affirms that he or she will not (i)
+exercise any of his or her remaining Copyright and Related Rights in the Work
+or (ii) assert any associated claims and causes of action with respect to the
+Work, in either case contrary to Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+    A. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+
+    B. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied, statutory or
+    otherwise, including without limitation warranties of title,
+    merchantability, fitness for a particular purpose, non infringement, or the
+    absence of latent or other defects, accuracy, or the present or absence of
+    errors, whether or not discoverable, all to the greatest extent permissible
+    under applicable law.
+
+    C. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without limitation
+    any person's Copyright and Related Rights in the Work. Further, Affirmer
+    disclaims responsibility for obtaining any necessary consents, permissions
+    or other rights required for any use of the Work.
+
+    D. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to this
+    CC0 or use of the Work.

README.md

@@ -8,4 +8,4 @@ Glitch in the Matrix
 It has a number of limitations at present, and is not recommended for production use. Still,
 it is provided in the hope that it might be useful.
 
-Licensed under the [Unlicense](http://unlicense.org/).
+Licensed under CC0.

examples/echo.rs

@@ -0,0 +1,53 @@
+extern crate glitch_in_the_matrix as gm;
+extern crate futures;
+extern crate tokio_core;
+
+use futures::{Future, Stream};
+use tokio_core::reactor::Core;
+use gm::{MatrixClient, MatrixFuture};
+use gm::types::{Content, Message};
+use std::env;
+
+fn main() {
+    let mut core = Core::new().unwrap();
+    let hdl = core.handle();
+    let mut args = env::args().skip(1).collect::<Vec<_>>();
+    if args.len() != 3 {
+        println!("Usage: cargo run --example echo -- SERVER USERNAME PASSWORD");
+        return;
+    }
+    let (server, username, password) = (&args[0], &args[1], &args[2]);
+    println!("server: {}\nusername: {}\npassword: {}", server, username, password);
+    let mut mx = core.run(MatrixClient::login(username, password, server, &hdl)).unwrap();
+    println!("[+] Connected to Matrix.");
+    let mut ss = mx.get_sync_stream();
+    let mut first = true;
+    let fut = ss.for_each(|sync| {
+        let mut futs: Vec<MatrixFuture<()>> = vec![];
+        if !first {
+            // We discard the results of the initial `/sync`, because we only want to echo
+            // new requests.
+            for (rid, room) in sync.rooms.join {
+                for event in room.timeline.events {
+                    match event.content {
+                        Content::RoomMessage(m) => {
+                            if let Message::Text { body, .. } = m {
+                                if event.sender == mx.user_id() {
+                                    continue;
+                                }
+                                futs.push(Box::new(mx.send_simple(&rid, body).map(|_| ())));
+                            }
+                        },
+                        _ => {}
+                    }
+                    futs.push(Box::new(mx.read_receipt(&rid, &event.event_id).map(|_| ())));
+                }
+            }
+        }
+        else {
+            first = false;
+        }
+        futures::future::join_all(futs.into_iter()).map(|_| ())
+    });
+    core.run(fut).unwrap();
+}